Bentzer nach ALphabet

Supprtfeld Email und Name nicht änderbar
Support Imagefile weg
Wort AGENTUR im Organigramm weg
ALLEN Tabellen sind jetzt Responsive
Bei ALLEN Tabellen kann jetzt oben gesucht werden
Es gibt bei Standards jetzt eine Zahl, wenn es mehr als 3 gibt
Bei Standards werden nur 3 angezeigt
Die Cards bei Standards sind alle gleichgroß

areas/templates/areas/areas_management.html

@@ -12,6 +12,10 @@
     </div>
   </div>
   <div class="row mt-3">
+    <div class="form-group mb-2">      
+      <input class="form-control" id="tableSearch" size="50" type="text" placeholder="Suche in Tabelle...">
+    </div>    
+    <div class="table-responsive">
     <table class="table">
           <thead>
           <tr>
@@ -22,6 +26,7 @@
             <th scope="col">&nbsp;</th>
           </tr>
         </thead>
+        <tbody id="tableresults">
          {% for item in areas_of_agency %}
           <tr>
               <td>{{ item.name }}</td>
@@ -44,6 +49,18 @@
               </td>  
           </tr>
         {% endfor %}     
+        </tbody>
       </table>
+    </div>
 </div>
+<script>
+$(document).ready(function(){
+  $("#tableSearch").on("keyup", function() {
+    var value = $(this).val().toLowerCase();
+    $("#tableresults tr").filter(function() {
+      $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+    });
+  });
+});
+</script>
 {% endblock content %}

news/templates/news/news_management.html

@@ -7,13 +7,17 @@
     Hier können aktuelle Nachrichten für die Agentur erstellt und verwaltet werden.
   </p>
   <div class="row">
-    <div class="content-section col-4">
       <a class="btn btn-primary" href="{% url 'news-add' %} ">News erstellen</a>
-    </div>
+   
   </div>
-  
+  <hr>
-  <div class="row mt-3">
+  <div class="row">
-    <table class="table">
+    
+    <div class="form-group mb-2">      
+      <input class="form-control" id="tableSearch" size="50" type="text" placeholder="Suche in Tabelle...">
+    </div>
+    <div class="table-responsive">
+    <table class="table" >
           <thead>
           <tr>
             <th scope="col">Titel</th>
@@ -23,7 +27,8 @@
             <th scope="col">&nbsp;</th>
           </tr>
         </thead>
-         {% for news_single in news %}
+        <tbody id="tableresults">
+         {% for news_single in news %}         
           <tr>
               <td><a href="{% url 'news-single' news_single.pk %}">{{news_single.name }}</a></td>
               <td>{{ news_single.created_by.first_name }} {{ news_single.created_by.last_name }}</td>
@@ -45,7 +50,19 @@
                 </div>
               </td>  
           </tr>
-        {% endfor %}     
+        {% endfor %} 
+        </tbody>    
       </table>
+    </div>
 </div>
+<script>
+$(document).ready(function(){
+  $("#tableSearch").on("keyup", function() {
+    var value = $(this).val().toLowerCase();
+    $("#tableresults tr").filter(function() {
+      $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+    });
+  });
+});
+</script>
 {% endblock content %}

orga/templates/orga/orga_main.html

@@ -18,7 +18,7 @@
 <script type="text/javascript">
 
 var data = [
-    { 'id': 'parent', 'role': "", 'name': 'Agentur {{request.user.profile.agency.name}}', 'color': '#71AF17', "imageUrl": ""},    
+    { 'id': 'parent', 'role': "", 'name': '{{request.user.profile.agency.name}}', 'color': '#71AF17', "imageUrl": ""},    
     {% for u in agencyuser %}
       {% if u.profile.parent == u %}
         { 'id': '{{u.pk}}' , 'name': "{{u.first_name}} {{u.last_name}}",'role': '{{u.profile.get_func_display}}\n{{u.profile.compfunc}}', 'manager': 'parent', 'color': '#1859B7', "imageUrl": "{{u.profile.get_photo_url}}", 'userid' : '{{u.pk}}' },

standards/templates/standards/standards_management.html

@@ -39,7 +39,23 @@
             {% if task.area == area %}            
             <div class="card text-center mt-1 mr-3 mb-3" style="width: 18rem; height: 12rem; float: left">
                   <div class="card-body">
-                    <h5 class="card-title"><a href="{% url 'standard-task' task.pk %}" style="color: #000000;">{{task.name}}</a></h5>
+                    {% setvar 0 %}
+                    {% for standard in standards_of_agency %}   
+                    {% getvar as varcounter %}                        
+                    {% if standard.task == task and standard.area == area%}                                                  
+                    {% incvar %}                          
+                    {% endif %}                      
+                    {% endfor %}
+                    {% getvar as varcounter %}
+                    {% if  varcounter > 3%}
+                    <h5 class="card-title">
+                      <a href="{% url 'standard-task' task.pk %}" style="color: #000000;">{{task.name}} ({{varcounter}})</a>
+                    </h5>
+                    {% else %}
+                    <h5 class="card-title">
+                      <a href="{% url 'standard-task' task.pk %}" style="color: #000000;">{{task.name}}</a>
+                    </h5>
+                    {% endif %}
                     {% setvar 0 %}
                     {% for standard in standards_of_agency %}   
                         {% getvar as varcounter %}                        
@@ -51,12 +67,15 @@
                    </div>
                 </div>
           {% endif %}          
-        {% endfor %}
+        {% endfor %}           
-           
        </div>        
       {% endfor %}
       <div class="tab-pane fade" id="t_userown" role="tabpanel" aria-labelledby="userown">
         <h4 class="mt-4 mb-4">Ihre Standards</h4>
+         <div class="form-group mb-2">      
+          <input class="form-control" id="tableSearch" size="20" type="text" placeholder="Suche in Tabelle...">
+        </div>
+        <div class="table-responsive">        
           <table class="table">
               <thead>
               <tr>
@@ -68,6 +87,7 @@
                 <th scope="col">&nbsp;</th>
               </tr>
             </thead>
+             <tbody id="tableresults">
           {% for standard in standards_of_user %}
           <tr>
               <td><a href="{% url 'standard-single' standard.pk %}">{{standard.name}}</a></td>
@@ -93,8 +113,10 @@
                </div>
               </td>
           </tr>
-          {% endfor %}     
+          {% endfor %}  
+          </tbody>      
           </table>
+        </div>
        </div> 
      </div>
     </div>    
@@ -102,6 +124,13 @@
   <script type="text/javascript">
     $(document).ready(function(){
         $('#area_tabs li:first-child a').tab('show');
+
+        $("#tableSearch").on("keyup", function() {
+        var value = $(this).val().toLowerCase();
+        $("#tableresults tr").filter(function() {
+          $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+        });
+      });
     })
     
 
@@ -109,5 +138,6 @@
       e.preventDefault()
       $(this).tab('show')
     });
+
   </script>
 {% endblock content %}

tasks/templates/tasks/tasks_management.html

@@ -13,7 +13,10 @@
   </div>
   
   <div class="row mt-3">
-
+    <div class="form-group mb-2">      
+      <input class="form-control" id="tableSearch" size="50" type="text" placeholder="Suche in Tabelle...">
+    </div>
+    <div class="table-responsive">
     <table class="table">
           <thead>
           <tr>
@@ -24,6 +27,7 @@
             <th scope="col">&nbsp;</th>
           </tr>
         </thead>
+        <tbody id="tableresults">
         {% for item in tasks_of_agency %}
           <tr>
               <td><a href="{% url 'standard-task' item.pk %}">{{item.name }}</a></td>
@@ -45,7 +49,19 @@
                 </div>
               </td>              
           </tr>
-        {% endfor %}     
+        {% endfor %}   
+        </tbody>  
       </table>
+    </div>
 </div>
+<script>
+$(document).ready(function(){
+  $("#tableSearch").on("keyup", function() {
+    var value = $(this).val().toLowerCase();
+    $("#tableresults tr").filter(function() {
+      $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+    });
+  });
+});
+</script>
 {% endblock content %}

users/templates/users/dashboard.html

@@ -11,7 +11,8 @@
 
     <div class="card d-block mb-3 mr-3 " style="width: 60%" >
       <div class="card-body" >
-          <h5 class="card-title">News</h5>    
+          <h5 class="card-title">News</h5>
+          <div class="table-responsive">    
             <table class="table">
               <thead>
               <tr>
@@ -29,6 +30,7 @@
             {% endfor %}     
           </table>
         </div>
+        </div>
       </div>
     <div class="card d-block mb-3" style="width: 34.8%">
       <div class="card-body">
@@ -39,7 +41,8 @@
 
      <div class="card d-block mb-3"  style="width: 96%">
       <div class="card-body">
-          <h5 class="card-title">Neueste Standards</h5>      
+          <h5 class="card-title">Neueste Standards</h5>  
+          <div class="table-responsive">        
           <table class="table">
               <thead>
               <tr>
@@ -57,6 +60,7 @@
           {% endfor %}     
           </table>
         </div>
+        </div>
     </div>
 
 	

users/templates/users/users_management.html

@@ -16,6 +16,10 @@
   </div>
 </div>
   <div class="row">
+    <div class="form-group mb-2">      
+      <input class="form-control" id="tableSearch" size="50" type="text" placeholder="Suche in Tabelle...">
+    </div>
+    <div class="table-responsive">        
     <table class="table">
         <thead>
         <tr>
@@ -29,6 +33,7 @@
           <th scope="col">&nbsp;</th>
         </tr>
       </thead>
+      <tbody id="tableresults">
     {% for item in users_of_agency %}
       <tr>
           <td><a href="{% url 'orga-single' item.pk %}">{{item.first_name }} {{ item.last_name }}</a></td>
@@ -59,8 +64,20 @@
               </div>
           </td>
       </tr>
-      {% endfor %}     
+      {% endfor %} 
+      </tbody>    
     </table>
   </div>
+  </div>
 </div>
+<script>
+$(document).ready(function(){
+  $("#tableSearch").on("keyup", function() {
+    var value = $(this).val().toLowerCase();
+    $("#tableresults tr").filter(function() {
+      $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+    });
+  });
+});
+</script>
 {% endblock content %}

users/usersforms.py

@@ -100,8 +100,7 @@ class UserAreaTaskForm(forms.Form):
 						self.fields['task_'+str(task.pk)] = forms.BooleanField(required=False, initial=False, label="<h5>"+task.name+"</h5>")
 
 
-class SupportForm(forms.Form):
+class SupportForm(forms.Form):	
-	
 	def __init__(self, user, *args, **kwargs):				
 		super().__init__(*args, **kwargs)		
 		user_name = user.first_name + " " + user.last_name
@@ -109,4 +108,5 @@ class SupportForm(forms.Form):
 		self.fields['mail'] = forms.EmailField(required=True, label="E-Mail", initial=user.email)		
 		self.fields['problemconc'] = forms.CharField(required=True, label="Problemzusammenfassung")
 		self.fields['problem'] = forms.CharField(required=True, widget=forms.Textarea, label="Ausführliche Beschreibung")
-		self.fields['image'] = forms.ImageField(required=False)
+		self.fields['name'].widget.attrs['readonly'] = True
+		self.fields['mail'].widget.attrs['readonly'] = True

users/views.py

@@ -89,7 +89,7 @@ class UsersManagement(LoginRequiredMixin, ListView):
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		# Get all Users of the Same Agency as logged user
-		users_of_agency = User.objects.filter(profile__agency__pk=self.request.user.profile.agency.pk)
+		users_of_agency = User.objects.filter(profile__agency__pk=self.request.user.profile.agency.pk).order_by('last_name')
 		context.update({'active_link' : 'usersmanagement', 'users_of_agency':users_of_agency})
 		return context