From ad5173f3588d816a7816b9ae78b16b11b0c4dd6e Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sun, 16 Feb 2020 17:12:47 +0100
Subject: [PATCH] =?UTF-8?q?Standardsumbaum=20komplett=20fertig,=200.8.0=20?=
 =?UTF-8?q?f=C3=BCr=20QS=20bereit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 standards/__pycache__/models.cpython-38.pyc   | Bin 2006 -> 2006 bytes
 standards/__pycache__/urls.cpython-38.pyc     | Bin 1126 -> 1198 bytes
 standards/__pycache__/views.cpython-38.pyc    | Bin 7480 -> 9026 bytes
 .../standards/standards_management.html       |  21 +-
 .../templates/standards/standards_single.html |  35 +-
 .../templates/standards/standards_update.html | 304 +++++++++++++++++-
 standards/urls.py                             |   1 +
 standards/views.py                            |  99 +++++-
 users/templates/users/base.html               |   2 +-
 9 files changed, 444 insertions(+), 18 deletions(-)

diff --git a/standards/__pycache__/models.cpython-38.pyc b/standards/__pycache__/models.cpython-38.pyc
index 59d37158b427330994dc41a7ad8795b54b7a4545..6e67bcbccdffcfaa4bf938de7ca9bb0bef10b50a 100644
GIT binary patch
delta 19
Zcmcb{e~q6jl$V!_0SGK&H*%d}2LLX*1aSZW

delta 19
Zcmcb{e~q6jl$V!_0SNXfY~(t_4gfH%1iAnK

diff --git a/standards/__pycache__/urls.cpython-38.pyc b/standards/__pycache__/urls.cpython-38.pyc
index 29e42d32824cef7b763b480ffc27da2ccd9c232b..ca044698c3065ba60cd280fcb0297cef3d84a10f 100644
GIT binary patch
delta 209
zcmaFHv5r$al$V!_0SKHEJ>yoeFfcp@agYHYkmCTv#SbQGcL_6R@uvu-aP=~$GNuTp
zaxUOr$T0DQfdr5zoywdgoFW5~OXrFbNs$d^(3IQE#Hhfi!Izj-T2QQSlbKgyRgi5L
zC0<&Pl30=&UtE%ymy%eN5}#BVpO}?cF<Fu68l&jsA52U5cp*xPlPbXyvzb>b$pIa~
V!^p!Z0E9ejB8+@cC;(%90|0*JF#-Sp

delta 137
zcmZ3-`HVw5l$V!_0SLA^zmJV%VPJR+;vfTFAjbiSi!V*o?h@u)z`c+mMJR=<mpPR&
zML3l?i+|z?1Fm$=DB%?8U<OT@%>s-HjFTgot}=>D)@NQa`4RIf1sR}r9!4HU0U+dI
O6Jg{7Ljfqw_Z<K+fEgbE

diff --git a/standards/__pycache__/views.cpython-38.pyc b/standards/__pycache__/views.cpython-38.pyc
index 64c16320685706f9e3362a609272ba4fa4859e37..6f6b600a21b17a33dc07df86e9e0db6c74fc03ef 100644
GIT binary patch
delta 2626
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

delta 1039
zcmZ9LO-vI}5P&<c%a%f0e)>nDR4k2lRn%bAgo7a(iND|v5G{sgVOJ=Yif<SB$znhf
zxyZrHRTHlsO%vlqO)z@U7~???^<q4G@IqqZPn=mIMt3vco1HiN-n^N4Ydw#<LIc5I
zjfbAs=Z+75&E5$m;mpIGeV`iY^B%3ed>c;s{Tj$U<kGL<r<w?8<@K630H^VJpi}E5
zyX+(60wr@MZ`pdu(4`^A$y9+cxz!ylc@|T_renF-)K$wWj1<kDLeaDi&kYvbuUxfW
zEM8_)Md2aWIBl6SKdP7V*9)|)Yx7U((k$6VLFVvA@JZWMT6$Cv{yaWXRFWekmI39V
zP!FUXucH_Zj+jW2G#QO|s}@wd)$tf%M_u;P86)_%{&79Wsa46%<KUx)b{uYwotd68
zblcoLZci4qlnj!a+`-5*&NIS{LyQQcpV7g%$Y^2=Fmj9`)El>-8euiW7-h5(D!v(A
zmI|dYd4Ww{#$E=WQ1i)MG*m>vs8ny}cq3Tc5{~1YWCZuN_yYrOw71CD>c;!w19gf3
zeicx@t3GLCIC2m2_%NcuG=7Y<H#}umPMSvqAOdn0>!L-NLMQt2kbA@|P02YzMK#Q#
zX`7PM`!{$Bt&<IIe2Ol|EV+-rEnJLcs^&?3g%4skU=FkK4tR%y@hdQoYw>h~7kxou
zasO3wh@gmoPtKKp#ueD&?%qaI8+%=2&E48f*#&G%M8U!Xi7b4;d?ImaksSVM2ZanQ
z{F9X-*q#ZP5Dply3JbyzjxfA;#e&!NQadP)*KLQYUU{5+-Nw~~OtWs`P;(}uDgT$>
zEsf$HeWO+ut|ptP5OvYdys3M!L`YBteyNIF!eYw<%6lw1NHv&D9&P!;UiAczNP+9e
zwfdo|av9$w->cI!BX44NZ5*Gq?x&yDTl>W~51ve=d@D59tL-VD*g6Ioz6;W3%rZE&
ga*?sbSZ1tXCA|&05ZbfRg92*Q#s*?7iGO4K4Jb+EWdHyG

diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html
index beaa4ff..8c1d5a5 100644
--- a/standards/templates/standards/standards_management.html
+++ b/standards/templates/standards/standards_management.html
@@ -54,10 +54,29 @@
                     </h5>      
                     {% setvar 0 %}
                     {% for standard in standards_of_agency %}   
+                        <!-- CHECK FOR GROUPVISIBLE -->
+                        {% setbool False %}
+                        {% for ag in standard.visibleby.all %}
+                          {% if request.user|has_group:ag.group.name %}   
+                            {% setbool True %}                  
+                            {% endif %}
+                        {% endfor %}
+
+                        {% if standard.visibleby.all|length == 0 %}
+                          {% setbool True %}  
+                        {% endif %}
+
+                        {% getbool as groupchecker %}
+
+
                         {% getvar as varcounter %}                        
                         {% if standard.task == task and standard.area == area and varcounter < 3 %}                                                  
                         {% incvar %}
-                          <p class="card-text"><a href="{% url 'standard-single' standard.pk %}">{{standard.name}}</a></p>
+                          {% if groupchecker %}
+                          <p class="card-text"><a href="{% url 'standard-single' standard.pk %}">{{standard.name|truncatechars:40}}</a></p>
+                          {% else %}                          
+                          <p class="card-text text-secondary"><i class="fas fa-lock"></i>&nbsp;{{standard.name|truncatechars:40}}</p>
+                          {% endif %}                          
                         {% endif %}                      
                     {% endfor %}                    
                    </div>
diff --git a/standards/templates/standards/standards_single.html b/standards/templates/standards/standards_single.html
index 145be84..e97f652 100644
--- a/standards/templates/standards/standards_single.html
+++ b/standards/templates/standards/standards_single.html
@@ -1,4 +1,5 @@
 {% extends "users/base.html" %}
+{% load counter_tag %}
 {% block content %}
 <div class="content-section col-12">
   <nav aria-label="breadcrumb">
@@ -39,7 +40,11 @@
   <hr>
   <div class="row col">
 
+    {% if standard.addedfiles.all|length == 0 and standard.linked_standards.all|length == 0 %}
+    <div class="card col-12" style="min-height: 500px">  
+    {% else %}
     <div class="card col-9" style="min-height: 500px">  
+    {% endif %}
       <div class="card-body">
         <h5 class="card-title"></h5>
           <p class="card-text">
@@ -50,9 +55,8 @@
     </div>
     <!-- FILES -->
     <div class="col-3">
-
     {% if standard.addedfiles.all|length > 0 %}
-    <div class="card col-14 ml-2" style="">  
+    <div class="card col-14 ml-2 mb-3" style="">  
       <div class="card-body">
         <h5 class="card-title">Dateien</h5>
           <p class="card-text">
@@ -65,12 +69,32 @@
     {% endif %}
       <!-- STANDARDS -->
     {% if standard.linked_standards.all|length > 0 %}
-    <div class="card col-14 ml-2 mt-3" style=""> 
+    <div class="card col-14 ml-2" style=""> 
       <div class="card-body">
         <h5 class="card-title">Verwandte Standards</h5>
           <p class="card-text">
             {% for standard in standard.linked_standards.all %} 
-            <a href="{% url 'standard-single' standard.pk %}">{{standard.name|truncatechars:30}}</a><br />            
+
+
+            {% setbool False %}
+            {% for ag in standard.visibleby.all %}
+              {% if request.user|has_group:ag.group.name %}   
+                {% setbool True %}                  
+                {% endif %}
+            {% endfor %}
+
+            {% if standard.visibleby.all|length == 0 %}
+              {% setbool True %}  
+            {% endif %}
+
+            {% getbool as groupchecker %}
+
+              {% if groupchecker %}
+              <a href="{% url 'standard-single' standard.pk %}">{{standard.name|truncatechars:30}}</a><br />            
+              {% else %}                          
+              <i class="fas fa-lock"></i>&nbsp;{{standard.name|truncatechars:30}}</p>
+              {% endif %} 
+            
             {% endfor %}
           </p>
       </div>
@@ -78,5 +102,8 @@
     {% endif %}
     </div>    
   </div>  
+  {% for g in standard.visibleby.all %}
+    {{g.agencygroupname}}
+  {% endfor %}
 </div>
 {% endblock content %}
\ No newline at end of file
diff --git a/standards/templates/standards/standards_update.html b/standards/templates/standards/standards_update.html
index 00d2e7b..56fa28a 100644
--- a/standards/templates/standards/standards_update.html
+++ b/standards/templates/standards/standards_update.html
@@ -1,13 +1,122 @@
 {% extends "users/base.html" %}
 {% load crispy_forms_tags %}
+{% load counter_tag %}
 {% block content %}
-<div class="content-section col-6">
-  <h3>Standard bearbeiten</h3>
+<div class="content-section col-12">
+  <h3>Standard bearbeiten&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Aktualisieren Sie hier die Informationen des Standards." class="far fa-question-circle"></i></small></h3>
   <hr>  
   <form method="POST" id="taskareaform">
 	  	{% csrf_token %}
-	  	{{normalForm|crispy}}
-	  	
+
+	  	<div class="row"><div class="col-8">
+      {% for field in normalForm %}
+        {% if forloop.counter|divisibleby:5 %}
+        </div><div class="col-3">
+	  	{{field|as_crispy_field }}
+        {% else %}
+        {{field|as_crispy_field }}
+        {% endif %}
+      {% endfor %}
+
+      <!-- COLLAPSE AREA FOR GROUPS FILES AND LINKED STANDARDS -->
+      <div class="accordion" style="margin-top: 47px" id="additionalStandardInfos">
+      <div class="card">
+        <div class="card-header" id="st_groups">
+          <h5 class="mb-0">
+            <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#stgroups_content" aria-expanded="false" aria-controls="stgroups_content">
+              Gruppen&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, welche Gruppe diesen Standard sehen kann. Ist keine ausgewählt, ist der Standard für alle sichtbar." class="far fa-question-circle"></i></small>
+            </button>
+          </h5>
+        </div>        
+        <div id="stgroups_content" class="collapse" aria-labelledby="st_groups" data-parent="#additionalStandardInfos">
+          <div class="card-body">
+            {% for g in agencygroups %}            
+            <div class="custom-control custom-checkbox mb-2"> 
+              {% if g in standard.visibleby.all %}                       
+              <input type="checkbox" class="custom-control-input groupclass" onclick="javascript:groupsChange({{g.pk}}, this.checked)"  name="group_{{g.pk}}" id="group_{{g.pk}}" checked="true">
+              {% else %}
+              <input type="checkbox" class="custom-control-input groupclass" onclick="javascript:groupsChange({{g.pk}}, this.checked)"  name="group_{{g.pk}}" id="group_{{g.pk}}">
+              {% endif %}
+              
+            <label class="custom-control-label" for="group_{{g.pk}}" >{{g.agencygroupname}}</label>
+            </div>            
+          {% endfor %}
+          </div>
+        </div>
+      </div>
+      {% if request.user.profile.agency.module_files %}
+      <div class="card">
+        <div class="card-header" id="st_files">
+          <h5 class="mb-0">
+            <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#st_files_content" aria-expanded="false" aria-controls="st_files_content">
+              Dateien&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Fügen Sie ihren Standards Dateien zu. Diese liegen entweder bereits unter Dateien oder können iher direkt hochgeladen werden. Neu hochgeladene Dateien werden im Heimverzeichnis gespeichert." class="far fa-question-circle"></i></small>
+            </button>
+          </h5>
+        </div>
+        <div id="st_files_content" class="collapse" aria-labelledby="st_files" data-parent="#additionalStandardInfos">
+          <div class="card-body">
+            <div class="input-group mb-3">
+            <input class="form-control searchuserfieldstask" list="possfiles" id="searchfiles" type="text" onkeyup="javascript:updateLinkedFiles()" >
+            <div class="input-group-append">            
+              <button type="button" onclick="javascript:clearSearchfieldAddFile()" class="btn btn-secondary" ><i class="fas fa-times"></i></button>
+            </div>
+              <datalist id="possfiles">
+                {% for f in possibleFilesByVisible %}            
+                <option id="file_{{f.pk}}" value="{{f.name}}">{{f.name}}</option>            
+                {% endfor %}
+              </datalist>        
+          </div>
+          Verlinkte Dateien:
+          <table id="linkedfiles" class="table table-hover table-sm">
+            {% for f in standard.addedfiles.all %}
+            <tr id="fileadded_{{f.pk}}"><td>{{f.name|truncatechars:30}}</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remFile({{f.pk}}, '{{f.name}}')"><i class="fas fa-trash-alt"></i></button></td></tr>
+            {% endfor %}
+          </table>                          
+          <input type="file" id="uploadedfile" name="uploadedfile" style="display:none">
+           {% if user|usergperm:"filesmanager" %} 
+          <div class="alert alert-secondary text-center mt-5" id="directdiv" role="alert" style="line-height: 17px; text-align: center;">
+          <button type="button" class="btn btn-primary btn-sm" id="uploadButton" onclick="javascript:uploadButtonPush()"><i class="fas fa-plus"></i></button>&nbsp;&nbsp;<small>klicken/hineinziehen<p class="mt-2">Dateien werden im <b>Heimverzeichnis</b>gespeichert.
+          </small></p>
+          </div>
+          {% endif %}
+        
+          </div>
+        </div>
+      </div>      
+      {% endif %}
+      <div class="card">
+        <div class="card-header" id="st_linked">
+          <h5 class="mb-0">
+            <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#st_linked_content" aria-expanded="false" aria-controls="st_linked_content">
+              Standards&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Verlinken Sie hier andere Standards, die etwas mit diesem Standard zutun haben." class="far fa-question-circle"></i></small>
+            </button>
+          </h5>
+        </div>
+        <div id="st_linked_content" class="collapse" aria-labelledby="st_linked" data-parent="#additionalStandardInfos">
+          <div class="card-body">
+            <div class="input-group mb-3">
+            <input class="form-control" list="possstandards" id="searchstandards" type="text" onkeyup="javascript:updateLinkedStandards()" >
+            <div class="input-group-append">            
+              <button type="button" onclick="javascript:clearSearchfieldAddStandard()" class="btn btn-secondary" ><i class="fas fa-times"></i></button>
+            </div>
+              <datalist id="possstandards">
+                {% for s in possiblestandards %}            
+                <option id="standard_{{s.pk}}" value="{{s.name|truncatechars:30}}">{{s.name|truncatechars:30}}</option>            
+                {% endfor %}
+              </datalist>        
+          </div>
+          Verlinkte Standards:
+          <table id="linkedstandards" class="table table-hover table-sm">
+            {% for s in standard.linked_standards.all %}
+            <tr id="standardadded_{{s.pk}}"><td>{{s.name|truncatechars:30}}</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remStandard({{s.pk}}, '{{s.name|truncatechars:30}}')"><i class="fas fa-trash-alt"></i></button></td></tr>
+            {% endfor %}
+          </table>
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </div>
       <p>Wenn ein Standard bearbeitet wurde, kann er nur von einer Person mit dem Recht <i>Standards bearbeiten und freischalten</i> wieder veröffentlicht werden. Ein Standard wird nach Bearbeitung als <i>Nicht veröffentlicht</i> gesetzt.</p>
 	  <hr>	  	
 	  	<button type="submit" class="btn btn-success"  href="{% url 'standard-update' standard_id %} ">Aktualisieren</button>&nbsp;
@@ -23,6 +132,193 @@
   </form>
 </div>
 <script type="text/javascript">
+//STANDARD
+function remStandard(sid, sname){
+  console.log(sid, sname);
+}
+
+function clearSearchfieldAddStandard(){
+  $("#searchstandards").val("");
+}
+
+
+function remStandard(id, name){
+  $('#possstandards').append('<option id="standard_'+id+'" value="'+ name +'">'+ name +'</option>');
+  $("#standardadded_" + id).remove();
+  
+  $.ajax({                      
+        url: "{% url 'update_standard_by_ajax' standard.pk %}",                    
+        data: {
+          action : 's_remstandard',
+          standardid : id
+        },
+        success: function (data) {}
+      });
+}
+
+function updateLinkedStandards(){
+  var g = $('#searchstandards').val();
+  var id = $('#possstandards').find('option[value="' + g + '"]').attr('id');
+  if(id != undefined && id.length > 0){  
+    tempid_standard = id.split("_")[1];
+    clearSearchfieldAddStandard();    
+    $("#" + id).remove();     
+    $("#linkedstandards").append('<tr id="standardadded_'+tempid_standard+'"><td>' + g + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remStandard('+tempid_standard+', \''+g+'\')"><i class="fas fa-trash-alt"></i></button></td></tr>');
+  }
+
+  $.ajax({                      
+        url: "{% url 'update_standard_by_ajax' standard.pk %}",                    
+        data: {
+          action : 's_addstandard',
+          standardid : tempid_standard
+        },
+        success: function (data) {}
+      });
+}
+
+//FILES
+function remFile(fileid, filename){
+  console.log(fileid);
+  $("#fileadded_" + fileid).remove();
+  $('#possfiles').append('<option id="file_'+fileid+'" value="'+ filename +'">'+ filename +'</option>');
+  $.ajax({                      
+        url: "{% url 'update_standard_by_ajax' standard.pk %}",                    
+        data: {
+          action : 's_remfile',
+          fileid : fileid
+        },
+        success: function (data) {}
+      });
+}
+
+function clearSearchfieldAddFile(){
+  $("#searchfiles").val("");
+}
+
+function updateLinkedFiles(){  
+  var g = $('#searchfiles').val();
+  var id = $('#possfiles').find('option[value="' + g + '"]').attr('id');
+  if(id != undefined && id.length > 0){  
+    tempid_file = id.split("_")[1];    
+    clearSearchfieldAddFile();    
+    $("#" + id).remove();     
+    $("#linkedfiles")   .append('<tr id="fileadded_'+tempid_file+'"><td>' + g + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remFile('+tempid_file+', \''+g+'\')"><i class="fas fa-trash-alt"></i></button></td></tr>');
+
+     $.ajax({                      
+        url: "{% url 'update_standard_by_ajax' standard.pk %}",                    
+        data: {
+          action : 's_addfile',
+          fileid : tempid_file
+        },
+        success: function (data) {}
+      });
+  }
+}
+
+
+//FILES
+// preventing page from redirecting
+ $("html").on("dragover", function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+ });
+  $("html").on("drop", function(e) { e.preventDefault(); e.stopPropagation(); });
+
+   $( "#directdiv" ).on('dragenter', function (e) {
+        e.stopPropagation();
+        e.preventDefault();
+        currentid = e["currentTarget"]['id'];
+        $("#directdiv").addClass('bg-secondary');         
+    });
+
+
+$('#directdiv').on('drop', function (e) {
+        e.stopPropagation();
+        e.preventDefault();
+        $("#directdiv").removeClass('bg-secondary');                   
+        uploadAction(e.originalEvent.dataTransfer.files[0], e["currentTarget"]['id'].split("_")[0]);        
+    });
+
+$('#directdiv').on('dragleave', function (e) {
+        e.stopPropagation();
+        e.preventDefault();        
+        currentid = e["currentTarget"]['id'];                
+        $("#directdiv").removeClass('bg-secondary');         
+    });    
+
+allowedtypes = "application/msword, application/vnd.ms-excel, application/vnd.ms-powerpoint, text/plain, application/pdf, image/*"
+
+
+
+function uploadButtonPush(){
+  $("#uploadedfile").click();
+}
+
+$('#uploadedfile').on('change', function() {  
+    uploadAction($("#uploadedfile")[0]['files'][0], {{parentid}}); 
+});
+
+function uploadAction(filetodo){
+  var formData = new FormData();
+  formData.append("uploadedfile", filetodo); 
+  if(allowedtypes.includes(filetodo.type) && filetodo.type.length > 0){
+    $.ajax({
+        url: "{% url 'cloud-adddir' parentid %}",
+        headers: {
+                      "X-CSRFTOKEN": "{{ csrf_token }}"
+              },
+        data: formData,
+        type: 'POST',
+        cache: false,
+        processData: false,
+        contentType: false,
+        success: function(data) {
+          if(data["success"] == true){
+            $("#linkedfiles")   .append('<tr id="fileadded_'+data["data"]["savedobj_id"]+'"><td>' + data["data"]["savedobj_name"] + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remFile('+data["data"]["savedobj_id"]+', \''+data["data"]["savedobj_name"]+'\')"><i class="fas fa-trash-alt"></i></button></td></tr>');
+            $.ajax({                      
+              url: "{% url 'update_standard_by_ajax' standard.pk %}",                    
+              data: {
+                action : 's_addfile',
+                fileid : data["data"]["savedobj_id"]
+              },
+              success: function (data) {}
+            });
+          }
+          else{
+            $("#forbiddenFileType").modal("toggle")
+          }
+          
+        }
+     });  
+  }
+  else{
+    $("#forbiddenFileType").modal("toggle")
+  }
+}
+
+//GROUP CHANGE
+function groupsChange(groupid, value){
+  if(value){
+    $.ajax({                      
+        url: "{% url 'update_standard_by_ajax' standard.pk %}",                    
+        data: {
+          action : 's_addgroup',
+          groupid : groupid
+        },
+        success: function (data) {}
+      });
+  }
+  else{
+   $.ajax({                      
+        url: "{% url 'update_standard_by_ajax' standard.pk %}",                    
+        data: {
+          action : 's_remgroup',
+          groupid : groupid
+        },
+        success: function (data) {}
+      });
+  }
+}
   /* 
     Ajax-Request zum nachladen der Aufgaben nach Auswahl der Bereiche
   */
diff --git a/standards/urls.py b/standards/urls.py
index 19e8171..013d97c 100644
--- a/standards/urls.py
+++ b/standards/urls.py
@@ -12,6 +12,7 @@ urlpatterns = [
 	path('standardadd/', views.StandardAdd, name='standard-add'),  
 	path('standardupdate/<int:id>', views.StandardUpdate, name='standard-update'),
 	path('ajax/loadtasks/', views.load_tasks, name='ajax_loadtasks'),
+	path('ajups/<int:pk>', views.updatesbyajax, name='update_standard_by_ajax'),
 	path('standards/<int:pk>/delete', StandardDeleteView.as_view(), name='standard-delete'), 
 	path('standard/<int:pk>/changestat', views.StandardChangePublic, name="standard-status"),
 	path('standard/<int:pk>/single', views.StandardSingle, name="standard-single"),
diff --git a/standards/views.py b/standards/views.py
index d490b54..62da6ff 100644
--- a/standards/views.py
+++ b/standards/views.py
@@ -176,14 +176,42 @@ def StandardUpdate(request, id):
 		#normalForm = StandardUpdateStandard(instance=standard)
 		normalForm = StandardUpdateStandard(instance=standard)
 		editorForm = StandardUpdateStandardEditor(instance=standard)
-		
+	
+	possibleFilesByVisible = []
+
+	allfiles = DataFile.objects.filter(agency=request.user.profile.agency)
+
+	for file in allfiles:
+		user_can_view_file = False
+		parentdir = DataDir.objects.get(pk=file.parent.pk)
+		if(parentdir.is_root == False):
+			for p_group in parentdir.visibleby.all():
+				if p_group.group in request.user.groups.all():
+					user_can_view_file = True
+		else:
+			user_can_view_file = True
+		# Check if file is in standard
+		if file not in standard.addedfiles.all():
+			if user_can_view_file:
+				possibleFilesByVisible.append(file)
+
+	possiblestandards = Standards.objects.filter(agency=request.user.profile.agency, public=True)
+	possiblestandards_final = []
+	for s in possiblestandards:
+		if s not in standard.linked_standards.all():
+			possiblestandards_final.append(s)
 
 	context = {
 		'normalForm' : normalForm,
 		'editorForm' : editorForm,
+		'standard' : standard,
 		'active_link' : 'standards',
 		'standard_id' : standard.pk,
-		'standard_status' : standard.public
+		'standard_status' : standard.public,
+		'possibleFilesByVisible' : possibleFilesByVisible,
+		'agencygroups' : AgencyGroup.objects.filter(agency=request.user.profile.agency),
+		'parentid' : list(DataDir.objects.filter(agency=request.user.profile.agency, is_root=True))[0].pk,
+		'possiblestandards' : possiblestandards_final
 	}
 	return render(request, 'standards/standards_update.html', context)
 
@@ -225,12 +253,31 @@ def StandardChangePublic(request, pk):
 
 @login_required
 def StandardSingle(request, pk):
-	standard = Standards.objects.get(pk=pk)
-	context = {
-		'active_link':'standards',
-		'standard' : standard
-	}
-	return render(request, 'standards/standards_single.html', context)
+
+	# CHECK IF USER HAS RIGHTS TO SEE THIS DIR
+	groupsofstandard = Standards.objects.get(pk=pk, agency=request.user.profile.agency)
+
+	userisingroup = False
+
+	if len(groupsofstandard.visibleby.all()) == 0:
+		userisingroup = True
+	else:
+		for ag in groupsofstandard.visibleby.all():
+			if ag.group in request.user.groups.all():
+				userisingroup = True
+
+	if userisingroup:
+		standard = Standards.objects.get(pk=pk)
+		context = {
+			'active_link':'standards',
+			'standard' : standard
+		}
+		return render(request, 'standards/standards_single.html', context)
+	else:
+		context = {
+			'active_link':'standards'
+		}
+		return render(request, 'standards/standards_noentrie.html', context)
 
 
 @login_required
@@ -261,3 +308,39 @@ def StandardTask(request, pk):
 	return render(request, 'standards/standard_task.html', context)
 
 
+@login_required
+def updatesbyajax(request, pk):
+	if(request.method == "GET"):
+		success = True
+		workingstandard = Standards.objects.get(pk=pk)
+		# Check for correct user and userrights
+		if(request.user.profile.agency == workingstandard.agency and request.user.has_perm("standardmanager")):
+			# CHANGE GROUP
+			# ADD
+			if(request.GET["action"] == "s_addgroup"):
+				workingstandard.visibleby.add(AgencyGroup.objects.get(pk=request.GET["groupid"]))
+			# REMOVE
+			elif(request.GET["action"] == "s_remgroup"):
+				workingstandard.visibleby.remove(AgencyGroup.objects.get(pk=request.GET["groupid"]))
+			# FILES
+			# REMOVE
+			elif(request.GET["action"] == "s_remfile"):
+				workingstandard.addedfiles.remove(DataFile.objects.get(pk=request.GET["fileid"]))
+			# ADD
+			elif(request.GET["action"] == "s_addfile"):
+				workingstandard.addedfiles.add(DataFile.objects.get(pk=request.GET["fileid"]))
+			# STANDARD
+			# REMOVE
+			elif(request.GET["action"] == "s_remstandard"):
+				workingstandard.linked_standards.remove(Standards.objects.get(pk=request.GET["standardid"]))
+			# ADD
+			elif(request.GET["action"] == "s_addstandard"):
+				workingstandard.linked_standards.add(Standards.objects.get(pk=request.GET["standardid"]))
+
+
+
+
+		else:
+			success = False			
+
+	return JsonResponse({"success" : success})
\ No newline at end of file
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index f55af23..01fda29 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -213,7 +213,7 @@
         <a style="color: #999; text-decoration: none;" href="{% url 'impressumda' %}">Impressum</a>
       </div>
       <div style="margin-top: 10px; margin-bottom: 5px;" class="sidebar-heading">
-        Version 0.7.4
+        Version 0.8.0
       </div>
     </div>    
     </ul>