From 670b2bce6c5e8b395898e2969b04ba370db72d78 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sat, 15 Feb 2020 00:21:57 +0100
Subject: [PATCH] Dateisystem einmal umgeschrieben und auf Objekte umgestellt,
 dragndrop angefangen

---
 cloud/__pycache__/models.cpython-38.pyc | Bin 1240 -> 2573 bytes
 cloud/__pycache__/urls.cpython-38.pyc   | Bin 432 -> 374 bytes
 cloud/__pycache__/views.cpython-38.pyc  | Bin 3002 -> 2074 bytes
 cloud/models.py                         |  36 ++++-
 cloud/templates/cloud/cloud_main.html   | 184 +++++++++++++-----------
 cloud/urls.py                           |   4 +-
 cloud/views.py                          |  74 ++++++++++
 users/__pycache__/views.cpython-38.pyc  | Bin 17283 -> 17567 bytes
 users/templates/users/base.html         |   2 +-
 users/views.py                          |  13 +-
 10 files changed, 221 insertions(+), 92 deletions(-)

diff --git a/cloud/__pycache__/models.cpython-38.pyc b/cloud/__pycache__/models.cpython-38.pyc
index 07c3bcdf4a1fc9d1f4b5c7412a4bdb9a2e2cfe51..e24ec80db42d463e5ed7d7ffd1b56e7ec7dae96d 100644
GIT binary patch
literal 2573
zcmb`JS#R7_6vw^Ij6LxznJnGd%Qh@YTM$TWYDt=aPy?dV7i)y&nR}Bs_1NLqLzylw
zwBjw_03>+KSKw3dd|!F$SKtNy=X$1XT7?RMBmaHRUCy=d`JFSl)@alXTtA)J{N`uR
zF#cfU(aV8x5qJIrL>R(MjFB0bCbzA`8rgxZ+jioNDnVsb4XWCHbe@ycMsDDuzapyl
zjKJG8L`}H&4B<+1uYT7K=FsDbI(q8U9v?k(!bguk?P-X{RioRykM}UTrmBuIA(I>}
z=UOhQYpLp`9hnX%YOZ{4Qa0Yluv^3<c{5Ap(Bh@ji`y04Yq;}8h%kRKZX0{%o&~jU
zo4?xF&Dy$oHqu^2R79&~GrV=~&gyoY$b9wI`8%t(F5Kxls=A%gC@NI7oTIG$>#CZM
z2O{QIbK^8GqI4*g%L~(JBo7U0VB0@GUi+ZWACUJy%aR>Q{q<}(9?7)G`<tKl`Xb(m
zizt!owir`?m}FzoFTZ_df1(z~SQ}y&IV>`og!@ski#Qs&{#c7zXb*88xvH=(;?4_*
zGy+o?fhFxdN0`DAHvXIgC#ayOigrcTMD@T9T-cth@6CzYff@KmtOl&6Y(d+?J+Oj#
zZFisx99XPgEW;Tr2@eO`P|i9|^#1QP!%#-=&{6eK^nHk<*(r8aO~~zNoD`}uNTT$*
za?){<-2V$NduY=MJcuKvyzzdLMItP+Lz9+x)Kp%UhTuXLa_i8dXL&A<3{A-F;x-?T
zj=hgYF^&9P^D2C7b!}zm1u2JPh0Qryz$}-^wvJgTO)ONkFvQF-T!v8|xp~v)FI$-o
zbeEMIhU_8?RXq$5xpBg6KMcPeM@czC{5r~8+l^==mWd!vO66@}|I+3#(u>^LfOpvg
z(&Ye$QrT&CL-{~dhC`Bg2-VS666FPN8E?nvt8Zi^<DK*iIU$?Z)xP@r%iiU+o~mRw
zQc1+gu4-$SuC85Lzf3MHdWD5SeMI=nsSV*q&f=OKvu!r<*ETzr9(w{hM7o6TH#D9C
z9qI%Ss{tPumBJP-Du)LoJ>64B4{8ITs<SQUU^leQP&Q<9ucg<wk64UkM=n4YG2a$V
z_*>F_%g_^|1#C~UEevh*oVJ)hs061(M=YRjofeBgcS+Sa!0R#5JidfFkRB~SH|Pv^
zybK9^q+}k(fDzBGO$><gNhTZ}&4ZfDC!>)pC>}<Ma@i-xJMfvh+0w41SJJ!ev-Mq^
z#{<wan1r16aH|1l-(^}n!_(^6a=LTZd3**tIzAZ~yD}L#73g`G$f6hUpqE(AvOJ_g
zgTREmhI@v8YkE4f4A|<Pp;vhwPomdZn0D&2uvg`Onq{bPsU|w8#d%0sR;bpMD4p~&
zRz0E|KFh!Z*^xdY;sPFc(^DBt=uLLX89{Hcyv?%0vdY59(>a#&EDSqcU}4Zzbw47M
z*yDkJ2eUZ7IUhFz?`!Bw>=yz4vPC@S3Gg3O+aEFd6!8DIY72y$lJRa&Q)L+`(gegO
zbp377dw7}00j87Od5T4o%s6e)bI_ns?8Z5tdYmE(z*3X<uW6$9+4*r8vAY>Y?O8(1
zIO?AKXN>3#cKx7G{udZ@9O*;$cWnLR^JCs}E`&$wA6Gyg-Rd@#C-$OrCtDGNvc#XB
z+QST}#e<b-T<ortzvi0Hz~{uyXI+|6rX1D1bTlsFBrh4~PgRvG{BMx1xaC{xxIRo#
e-Qqk|?nmWs&nNuzr{CHK!fgv`yOmC()BYQqH7<<+

delta 548
zcmZuuL2DE-6wces>`d0#EiFq`>f%W-Sb8fxw1~x}o?HZ53R7qpHffn9GgC6Nl$N5x
z_Ta_ClCwWa@TfU?^;hW2w$)1mdHM3bmoH!PzVv^v-a)t9Avm^<hsWROy!Qms`HN>q
zKqQf%NdYM=aG={oltzd{*}f)e{D#O##@9r~3MOnu(~e~C3Ge*&Y8+g<sHD<0qTrxb
z#%Fd<RXM(x|N07v{QzU=*>};v{((;{{~i(I$Ue89ThBK+HGLE@%NQJ+p6M!+qNzBT
zl^bnVl>)_8qei@C9{So9`zjuMe1xzeS7ZW{)(nj|^bVsn81cY`XC^Nj7o6l;xuDDn
z<!Ie_dqJ)AiAlWJB6JbCNC;$wSj9~pU?7mdWirf~Y~z;Vt1cG8D+#OV`Y!Y5*dFTd
z<w{G_!@YUzlU+Qf_VePF2z`#0)p?poB*fS#Tx4p0($`P%KZqIl@ZZrtTV}~_2W!z1
z(j)%B3N}1+iJWBRX|*wJa$Os*y|~$hZ+#z(uf0#o#XH!jsa7umD{6m5f=^6ZIB6XI
E1t{c$TmS$7

diff --git a/cloud/__pycache__/urls.cpython-38.pyc b/cloud/__pycache__/urls.cpython-38.pyc
index e61a2b1cefef8f25532f84ca665b72ae1fbfd26b..99d2da436084ed7e14c8c60d6b739d731bf06132 100644
GIT binary patch
delta 116
zcmdnM{Edk(l$V!_0SIg*-Q%t?OyrYcbepKHE0@BS!rsfA%9z5D%9O>L!U^J~Gexnb
za0N4Ha!;(&<l?j`&M8f|D#*5*ct=ivCpjm-G(|TtB_$=Z$WN1fG6$pFWPL_CHjv>(
PT$6(tBUyMD`ThX_P1zhO

delta 199
zcmeyyw1Jr~l$V!_0SKP<xW=(DPUMqe^qZ)ytCq!@!j{6`%b3EE!r9B5%9z5H%9O>H
z!VTi3Gexnd@B}kx@=h$%H07}=E-A9gNi9pwvD2>-P0q<LP0<IF@wthad3qToxjCAQ
zw|GlZa|?13OH$+W5_3~0u9V~B0xQx@%u1~A)8v?VT~7BFdtz~XS!QZ^6i;GGN=jx?
nQYA?C7I$e;PC;TxNorAE@k)jw9-woJcqU6SMzV-7^8Et<IM6+y

diff --git a/cloud/__pycache__/views.cpython-38.pyc b/cloud/__pycache__/views.cpython-38.pyc
index f179322d163fef256d6286aa046741c0590304e8..c0fadf0c946cc18260d9e22f6cc94db4ac8b398c 100644
GIT binary patch
delta 1229
zcmZWn&2Jqw5ck;LkGJn7q-|bF5#)o2qE#RjNT?Eu5K>Beq8yrBo=~IB+D&(}AFp1&
zexO~wL&`A+loO~D2{$Be+~D6pLh=<Z{0oS$v0o!a!j^v?kH<6Pncq*ZezUN#J2w{*
z9KWvKxxagvkl*a#;$V3A7+3TAR~tWXia;zB3+2jarCc4Y0+I9LlDPbw9KmP}<tt**
z$#05R?vZ$S;=@1Fn3~{LqLW*hGNBc2XN64Zg%|<K9<FU0<`;wm(otM2BOS-xYeB#v
zRrfW~kkgzA+LD~-UhWHaOpieDYxv^jop*lMQsE!7X~#s+vX<t72w$*{SNZ=8!5VhV
z=|c?GJBH40{k$jWAyYrJ-f7hOX8^PCA>Q=So3ncKy!8aZ8GXqx3D3m>)b(HRj_W}?
zC1TL>BZl>uyKB4$nQHWotx4AGsk+w2PYz_2K2v}nza2BRguA+iVEl2SWTlOl7WG8L
z%=D8~XOHDxkyVF=3v^||nN22QFm!zQ$G<pYu3ooJ-mviAvUL^hE18H?P0H~XL+9>>
z!@V-es?CSGEaExCi>%RVc=By9obpK{l?leGet_+A`KT4^i5*Doa>T^PV_6CHnhj(7
z83!g%^3g=17i&A}VT!Zgje?{oT*5(GS6V*RYRy?RS#?mz&-U~0iP}KTpIh4>e!knB
ze8+B1O>f(N{8LQv5?(c%2!wKQlZLPiON;^q{&yHG(Rqk)F4B3YL;YWVpx(t7sjck!
z@KLbKajiu`KnKVef~}@%j1rtu!Oozg)0YR12c{Vkj<%L~NIUGlcTBOr44K8xb#_N4
zaU`sF8lDj#Ezf(%9nW&7<uje`BS#>EBS1=ocXtfC^U01YqKPW`1dCK9rHrYX+8Vmb
z$J}tMoR!*f!>gZEwn5D#O=Z)>1LK!cKdgnaRZ?$T7+P4j@Ro(^7TjarB#)(|hhd2j
zY7uW@U&YqoeG8T|YIFl}6wL^>SMTR0(6St3g053Dcn59F0G*(E|5=hJPd`9SV?Ekd
zMKFK?y$VYZq7?e-ChFt$AFo9BV9U_DnI(A@wXRq0{(^f;3FTshTV*XKh5X2Nv$=lq
Pb$_`J3zR~%j%)2dL;@nM

literal 3002
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
JJLcl={ttVS8^Ztq

diff --git a/cloud/models.py b/cloud/models.py
index 668db3c..9ac20c6 100644
--- a/cloud/models.py
+++ b/cloud/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 from django.contrib.auth.models import User
-from users.models import Agency
+from users.models import Agency, AgencyGroup
 # Create your models here.
 from django.db import models
 from django.utils import timezone
@@ -19,6 +19,36 @@ class Data(models.Model):
 	owner = models.ForeignKey(User, on_delete=models.PROTECT)
 	agency = models.ForeignKey(Agency, on_delete=models.CASCADE, default=None)
 
-	def __str__(self):
-		print(self.file.name)		
+	def __str__(self):		
 		return str(self.file.name)
+
+
+
+class DataDir(models.Model):
+	name = models.CharField(max_length=2000, default="", blank=True, null=True)
+	is_root = models.BooleanField(default=False)
+	dirs = models.ManyToManyField('self', blank=True, related_name='dirs_in_dirs', symmetrical = False)
+	datafiles = models.ManyToManyField('DataFile', blank=True, related_name='files_in_dir')
+	visibleby = models.ManyToManyField(AgencyGroup, blank=True, related_name='visible_by_user')
+	date_created = models.DateTimeField(default = timezone.now)
+	date_last_modified = models.DateTimeField(default = timezone.now)
+	owner = models.ForeignKey(User, on_delete=models.PROTECT, blank=True, null=True)
+	agency = models.ForeignKey(Agency, on_delete=models.CASCADE)	
+	parent = models.ForeignKey('DataDir', on_delete=models.CASCADE, blank=True, null=True, related_name='dir_in_dir')
+
+	def __str__(self):		
+		return str(self.name)
+
+
+class DataFile(models.Model):
+	name = models.CharField(max_length=2000, default="", blank=True, null=True)
+	file = models.FileField(null=True, max_length=255, upload_to=user_directory_path)
+	date_created = models.DateTimeField(default = timezone.now)
+	date_last_modified = models.DateTimeField(default = timezone.now)
+	owner = models.ForeignKey(User, on_delete=models.PROTECT)
+	agency = models.ForeignKey(Agency, on_delete=models.CASCADE, default=None)
+	parent = models.ForeignKey(DataDir, on_delete=models.PROTECT, related_name='thisfileindir')
+
+	def __str__(self):		
+		return str(self.name)
+
diff --git a/cloud/templates/cloud/cloud_main.html b/cloud/templates/cloud/cloud_main.html
index e49f215..3833a89 100644
--- a/cloud/templates/cloud/cloud_main.html
+++ b/cloud/templates/cloud/cloud_main.html
@@ -2,6 +2,7 @@
 {% load crispy_forms_tags %}
 {% load counter_tag %}
 {% block content %}
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
 <style>
 .icon-hover:hover{
   color: gray;
@@ -10,38 +11,22 @@
 <div class="content-section col-12">
   <h3>Dateien&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Hier können Sie Dateien und Ordner für ihre Agentur verwalten." class="far fa-question-circle"></i></small></h3>  
   <hr>  
-  {% if user|usergperm:"filesmanager" %}
-  <form method="POST" id="fileuploadform" enctype="multipart/form-data" class="col-6">
-	{% csrf_token %}
-      <input type="hidden" name="subdirinfo" value="{{level}}">
-      {{form.media}}
-  	  {{form|crispy}}
-  <div class="mt-2">
-  	<button class="btn btn-primary" type="submit">Hochladen</button>
-    <small>Dateien werden immer in das aktuelle Verzeichnis hochgeladen.</small>
-  </div>
-</form>
-{% endif %}
-  <div class="mt-4">  
-  <nav aria-label="breadcrumb">
+</div>
+
+<nav aria-label="breadcrumb">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item" aria-current="page"><a href="{% url 'cloud-main' level='home' %}"><i class="fas fa-home"></i></a></li>
-    {% for cr in crumplevel %}
-    {% if cr != 'home' %}            
-      {{forloop.counter1|add:1}}
-        {% if forloop.last %}      
+    <li class="breadcrumb-item" aria-current="page"><a href="{% url 'cloud-main' 'first' %}"><i class="fas fa-home"></i></a></li>
+    {% for cr in breadcrump %}    
+    	{% if forloop.last %}      
         <li class="breadcrumb-item" active>{{cr}}</li>
-        {% else %}        
-        <li class="breadcrumb-item"><a href="{% url 'cloud-main' cr %}">{{cr}}</a></li>        
-      {% endif %}
-    {% endif %}    
+        {% else %}	
+    	<li class="breadcrumb-item"><a href="{% url 'cloud-main' cr.pk %}">{{cr.name}}</a></li>  
+    	{% endif %}
     {% endfor %}
-    {% if user|usergperm:"filedirmanager" and user|usergperm:"filesviewer" %}
-    <li class="breadcrumb-item" active><i onclick="javascript:addDirModal()" class="fas fa-folder-plus icon-hover"></i></li>
-    {% endif %}
+    <li class="breadcrumb-item" active><i onclick="javascript:addDirModal()" class="fas fa-folder-plus icon-hover"></i></li>    
   </ol>
   </nav>
-  <table class="table table-hover">
+	<table class="table table-hover" id="dirfilestable">
 	  <thead>
 	    <tr>
 	      <th scope="col"></th>
@@ -52,47 +37,31 @@
 	    </tr>
 	  </thead>
 	  <tbody>	 
-    {% for dir in dirs %}
-      <tr>   
-        <td><i class="fas fa-folder"></i></td>     
-        <td><a href="{% url 'cloud-main' dir %}">{{dir|splitdirstyle}}</a></td>
-        <td></td>
-        <td></td>
-        <td>
-          {% if user|usergperm:"filedirmanager" and user|usergperm:"filesviewer" %}
-          <button type="button" class="btn btn-danger btn-sm" onclick="javascript:tryDelDir('{{dir|splitdirstyle}}')" data-toggle="tooltip" data-placement="top" title="Ordner löschen"><i class="fas fa-trash-alt"></i></button>
-          <button type="button" class="btn btn-primary btn-sm" onclick="javascript:changeDirName('{{dir|splitdirstyle}}')" data-toggle="tooltip" data-placement="top" title="Ordnernnamen andern"><small><i class="fas fa-pen"></i></small></button>
-          {% endif %}    
-        </td>
-      </tr>
-    {% endfor %} 	
-  	{% for ele in files %}      
-      	<tr>  	
-          <td><i class="fas fa-file"></i></td>		
-    			<td><a href="{{ele.file.url}}" download>{{ele.file|filename}}</a></td>
-    			<td>{{ele.owner.first_name}} {{ele.owner.last_name}}</td>
-    			<td>{{ele.date_created}}</td>
-    			<td>
-            {% if user|usergperm:"filesmanager" and user|usergperm:"filesviewer" %}
-            <button type="button" class="btn btn-danger btn-sm" onclick="javascript:tryDelFile({{ele.pk}})" data-toggle="tooltip" data-placement="top" title="Datei löschen"><i class="fas fa-trash-alt"></i></button>
-          <button type="button" class="btn btn-primary btn-sm" onclick="javascript:changeFileName({{ele.pk}})" data-toggle="tooltip" data-placement="top" title="Dateinamen andern"><small><i class="fas fa-pen"></i></small></button>
-          {% endif %}              
-          </td> 
-    		</tr>
-  	{% endfor %}
+      	{% for d in dirs %}
+      	<tr id="dir_{{d.pk}}" class="droppable_tr">  	
+          	<td id="dir_{{d.pk}}_icon"><i class="fas fa-folder" ></i></td>
+          	<td><a href="{% url 'cloud-main' d.pk %}">{{d.name}}</a></td>              			       
+		</tr>
+		{% endfor %}
+	  	{% for file in dir.DataFiles %}      
+	      	<tr>  	
+	          <td>
+	          	<i class="fas fa-file" ></i>{{file}}
+	          </td>    			       
+			</tr>
+	  	{% endfor %}
   </tbody>
 </table>
-  
-  </p>
-  </div>
-</div> 
+<div class="alert alert-secondary droppable_div text-center" id="{{parentid}}_div" role="alert" style="min-height: 80px; line-height: 50px; text-align: center;">
+  <i class="fas fa-plus"></i>&nbsp;Dateien ins aktuelle Verzeichnis hier hineinziehen.
+</div>
 
 <!-- MODEAL ADD DIR  -->
 <div class="modal fade" id="addDir" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="" aria-hidden="true">
   <div class="modal-dialog " role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title" id="mainmodalArea_title">Ordner in {{crumplevel|last}} erstellen</h5>
+        <h5 class="modal-title" id="mainmodalArea_title">Ordner in TODO erstellen</h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Schließen">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -110,26 +79,77 @@
     </div>
   </div>
 </div>
-
 <script>
-function tryDelFile(dataid){
-  console.log("FILE " + dataid);
-}
+//DROPPABLE
 
-function changeFileName(dataid){
-  console.log("FILE " + dataid);
-}
+// preventing page from redirecting
+ $("html").on("dragover", function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+ });
 
-function tryDelDir(dataid){
-  console.log("DIR " + dataid);
-}
+ $("html").on("drop", function(e) { e.preventDefault(); e.stopPropagation(); });
 
-function changeDirName(dataid){
-  console.log("DIR " + dataid);
-}
 
+ $( ".droppable_tr" ).on('dragenter', function (e) {
+        e.stopPropagation();
+        e.preventDefault();
+        currentid = e["currentTarget"]['id'];
+        $("#" + currentid + "_icon").html("");
+        $("#" + currentid + "_icon").html('<i class="fas fa-folder-open"></i>');
+        $("#" + currentid).addClass('table-secondary');         
+    });
+
+
+$('.droppable_tr').on('drop', function (e) {
+        e.stopPropagation();
+        e.preventDefault();
+        console.log("UPLOAD TO: DIR" + e["currentTarget"]['id']);
+        var file = e.originalEvent.dataTransfer.files;
+        $("#" + currentid).removeClass('table-secondary');
+        $("#" + currentid + "_icon").html("");
+        $("#" + currentid + "_icon").html('<i class="fas fa-folder"></i>');
+    });
+
+$('.droppable_tr').on('dragleave', function (e) {
+        e.stopPropagation();
+        e.preventDefault();        
+        currentid = e["currentTarget"]['id'];                
+        $("#" + currentid + "_icon").html("");
+        $("#" + currentid + "_icon").html('<i class="fas fa-folder"></i>');
+        $("#" + currentid).removeClass('table-secondary');         
+    });
+
+
+ $( ".droppable_div" ).on('dragenter', function (e) {
+        e.stopPropagation();
+        e.preventDefault();
+        currentid = e["currentTarget"]['id'];
+        $("#{{parentid}}_div").addClass('bg-secondary');         
+    });
+
+
+$('.droppable_div').on('drop', function (e) {
+        e.stopPropagation();
+        e.preventDefault();
+        $("#{{parentid}}_div").removeClass('bg-secondary');         
+        console.log("UPLOAD TO: DIR " + {{parentid}});
+        var file = e.originalEvent.dataTransfer.files;
+        
+    });
+
+$('.droppable_div').on('dragleave', function (e) {
+        e.stopPropagation();
+        e.preventDefault();        
+        currentid = e["currentTarget"]['id'];                
+        $("#{{parentid}}_div").removeClass('bg-secondary');         
+    });    
+
+
+
+
+// DIR FUNCTIONS
 function addDirModal(){
-
   $("#addDir").modal("toggle");
   $("#newdirname").val("");
 
@@ -143,23 +163,21 @@ function validateDirName(newdirname){
     $("#doActionTaskModal").attr("disabled", true); 
   }
 }
-
 function addDirAction(){
       $.ajax(
       {
         type: "GET",
-        url: "/cloud/clajax",
+        url: "{% url 'cloud-adddir' %}",
         data:{
-          adddirname : "{{level}}",
-          newdirname : $("#newdirname").val()
+         	action : "adddir",
+        	parent : {{parentid}},
+        	newdirname : $("#newdirname").val()
         },
         success: function( data ) 
-        { 
-          window.location = window.location; 
+        {         	
+          	window.location = window.location; 
       }
      });
 }
-
 </script>
-
-{% endblock content %}
+{% endblock %}
\ No newline at end of file
diff --git a/cloud/urls.py b/cloud/urls.py
index e42773c..8e604d7 100644
--- a/cloud/urls.py
+++ b/cloud/urls.py
@@ -3,6 +3,6 @@ from .views import CloudMain
 from . import views
 
 urlpatterns = [
-	path('<str:level>/', CloudMain.as_view(template_name="cloud/cloud_main.html"), name='cloud-main'),
-	path('clajax/', views.adddirbyajax, name="cloud-ajax"),
+	path('<slug:pk>', CloudMain, name='cloud-main'),
+	path('clajax/', views.adddirbyajax, name="cloud-adddir"),
 ]
diff --git a/cloud/views.py b/cloud/views.py
index ebc8d65..64881ae 100644
--- a/cloud/views.py
+++ b/cloud/views.py
@@ -12,9 +12,79 @@ from django.core.files.storage import default_storage
 from digitaleagentur.settings import BASE_DIR
 from django.http import JsonResponse
 import os
+from .models import DataDir, DataFile
+
+@login_required
+def CloudMain(request, pk):
+	diragency = []
+	alldirs = []
+	context = {}
+	breadcrump = []
+
+	if(pk == "first"):
+		diragency = list(DataDir.objects.filter(is_root=True, agency=request.user.profile.agency))[0]	
+		alldirs = DataDir.objects.filter(is_root=False, agency=request.user.profile.agency, parent=diragency)
+
+		context = {
+			'active_link' : 'cloud',
+			'dirs' : alldirs,
+			'parentid' : diragency.pk		
+
+		}
+	else:		
+		alldirs = DataDir.objects.filter(is_root=False, agency=request.user.profile.agency, parent=pk)
+
+		singleObj = DataDir.objects.get(pk=pk)
+		while( singleObj.is_root != True):
+			breadcrump.append(singleObj)			
+			singleObj = DataDir.objects.get(pk=singleObj.parent.pk)
+
+		breadcrump = breadcrump[::-1]
+
+		context = {
+			'active_link' : 'cloud',
+			'dirs' : alldirs,
+			'parentid' : pk,
+			'breadcrump' : breadcrump	
+
+		}
+	return render(request, 'cloud/cloud_main.html', context)
+
+@login_required
+def adddirbyajax(request):
+	success = True
+	if(request.method == "GET"):
+		parentid = request.GET.get("parent")
+		newdirname = request.GET.get("newdirname")
+		
+		parent_obj = DataDir.objects.get(pk=parentid, agency=request.user.profile.agency)
+		tempdir = DataDir(name=newdirname, parent=parent_obj, agency=request.user.profile.agency, owner=request.user)
+		tempdir.save()
+		parent_obj.dirs.add(tempdir)
+		parent_obj.save()
+		
+
+		
+
+	
+	return JsonResponse({"success" : success})
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+''' CLOUD ALT '''
+'''
 class CloudMain(LoginRequiredMixin, FormView):
 	form_class = CloudAddFileForm
 	success_url = '/cloud/home'
@@ -80,3 +150,7 @@ class CloudMain(LoginRequiredMixin, FormView):
 
 def adddirbyajax(request):	
 	return {"success" : success}
+
+'''
+
+
diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc
index 1016e4182c7dece2503d7fc062cad55f72608296..7b9caa676cfed8abb51c24c03ec1d343d8903631 100644
GIT binary patch
delta 5463
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
B&+Y&K

delta 5149
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
O=M=s+f0d4`Y5PCJ4}gvU

diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 9d2195c..a72679a 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -133,7 +133,7 @@
         {% else%}
       <li class="nav-item">
       {%endif%}
-        <a class="nav-link " href="{% url 'cloud-main' level='home' %}" aria-expanded="true">
+        <a class="nav-link " href="{% url 'cloud-main' 'first' %}" aria-expanded="true">
           <i class="fas fa-file"></i>
           <span>Dateien</span>
         </a>
diff --git a/users/views.py b/users/views.py
index b48aa17..52bba4c 100644
--- a/users/views.py
+++ b/users/views.py
@@ -29,7 +29,7 @@ from django.template.loader import render_to_string
 from io import StringIO
 from users.models import AgencyJob, AgencyGroup
 from django.contrib.auth.models import Group
-
+from cloud.models import DataDir
 
 def randomString(stringLength=10):
     """Generate a random string of fixed length """
@@ -87,7 +87,16 @@ def toUpdate(request):
 	else:	
 		print("default groups existing")
 
+	# INITIAL ROOT DIR
+	rootdir = DataDir.objects.filter(is_root=True, agency__pk=request.user.profile.agency.pk)
 
+	if(len(rootdir) == 0):
+		print("NO MAIN DIR FOUND - CREATE")
+		rootdir = DataDir(is_root=True, agency=request.user.profile.agency)
+		rootdir.save()
+		print("AGENCY ROOT DIR CREATED")
+	else:
+		print("MAIN ROOT DIR FOUND - FILESMODULE READY")
 '''
 
 DASHBOARD-View
@@ -126,8 +135,6 @@ class AgencyCreateView(CreateView):
 
 
 
-
-
 @login_required
 def dashboard(request):