From 47dcf94f51d57b3c4f159cd0edde66a9123bbf82 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Thu, 12 Dec 2019 20:47:51 +0100
Subject: [PATCH] Dashboard mit Kacheln IHR LAPPEN!

---
 orga/templates/orga/orga_main.html   |   3 +
 users/templates/users/dashboard.html | 108 ++++++++++++++++-----------
 2 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html
index 1cc0381..a8c73fe 100644
--- a/orga/templates/orga/orga_main.html
+++ b/orga/templates/orga/orga_main.html
@@ -77,6 +77,9 @@ function connectorDefaults(connector) {
   connector.targetDecorator.shape = 'None';
   connector.type = 'Orthogonal';
   connector.style.strokeColor = 'gray';
+
+  console.log(connector);
+
   return connector;
 }
 
diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html
index f7fba51..6ab7f2f 100644
--- a/users/templates/users/dashboard.html
+++ b/users/templates/users/dashboard.html
@@ -7,50 +7,68 @@
   <h5>Agentur: <b>{{ request.user.profile.agency.name }}</b></h5>
   <hr>
   
-  <div class="row">    
-    <div class="col-9">    
-      <h4>News</h4>    
-        <table class="table">
-          <thead>
-          <tr>
-            <th scope="col">Titel</th>
-            <th scope="col">Veröffentlicht von</th>
-            <th scope="col">Veröffentlicht am</th>
-          </tr>
-        </thead>
-         {% 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>
-              <td>{{ news_single.go_online_on|date:"d.m.Y, H:i" }}</td>                             
-          </tr>
-        {% endfor %}     
-      </table>
+  <div class="row" style="float: left;">    
 
-      <h4 class="mt-5">Neueste Standards</h4>    
-      <table class="table">
-          <thead>
-          <tr>
-            <th scope="col">Titel</th>
-            <th scope="col">Erstellt am</th>
-            <th scope="col">Erstellt von</th>            
-            <th scope="col">Geändert am</th>
-            <th scope="col">Geändert von</th>
-          </tr>
-        </thead>
-      {% for standard in standards_of_agency %}
-        <tr>
-            <td><a href="{% url 'standard-single' standard.pk %}">{{standard.name}}</a></td>
-            <td>{{standard.created_standard_date|date:"d.m.Y, H:i"}}</td>
-            <td>{{standard.created_standard_by.first_name}} {{standard.created_standard_by.last_name}}</td>
-            <td><small>{{standard.last_modified_on|date:"d.m.Y, H:i"}}</small></td>
-            <td><small>{{standard.last_modified_by.first_name}} {{standard.last_modified_by.last_name}}</small></td>
-        </tr>
-      {% endfor %}     
-      </table>
-  </div>
-	<div class="col-3 text-right" >
-  	 <img class="img-profile" width="100%" src="{{ request.user.profile.agency.agencypic.url }}">
-  	</div>  
+
+    <div class="card mb-3 col-9">
+      <div class="card-body">
+          <h5 class="card-title">News</h5>    
+            <table class="table">
+              <thead>
+              <tr>
+                <th scope="col">Titel</th>
+                <th scope="col">Veröffentlicht von</th>
+                <th scope="col">Veröffentlicht am</th>
+              </tr>
+            </thead>
+             {% 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>
+                  <td>{{ news_single.go_online_on|date:"d.m.Y, H:i" }}</td>                             
+              </tr>
+            {% endfor %}     
+          </table>
+        </div>
+      </div>
+
+      <div class="col-3 text-right" >
+     <img class="img-profile" width="100%" src="{{ request.user.profile.agency.agencypic.url }}">
+    </div>  
+
+
+    <div class="card mb-3 col-9">
+      <div class="card-body">
+          <h5 class="card-title">Neueste Standards</h5>      
+          <table class="table">
+              <thead>
+              <tr>
+                <th scope="col">Titel</th>
+                <th scope="col">Erstellt von</th>            
+                <th scope="col">Erstellt am</th>                
+              </tr>
+            </thead>
+          {% for standard in standards_of_agency %}
+            <tr>
+                <td><a href="{% url 'standard-single' standard.pk %}">{{standard.name}}</a></td>
+                <td>{{standard.created_standard_by.first_name}} {{standard.created_standard_by.last_name}}</td>
+                <td>{{standard.created_standard_date|date:"d.m.Y, H:i"}}</td>
+            </tr>
+          {% endfor %}     
+          </table>
+        </div>
+    </div>
+
+	
 </div>
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
+
+
+
+                    
+                    {% for standard in standards_of_agency %}
+                      {% if standard.task == task and standard.area == area %}
+                      <p class="card-text"><a href="{% url 'standard-single' standard.pk %}">{{standard.name}}</a></p>
+                      {% endif %}
+                     {% endfor %}
+                  
\ No newline at end of file