Explorar o código

Reihenfolge der Tabellenfelder angepasst

gc-server3 hai 6 días
pai
achega
968abbf834

+ 34 - 40
static/assets/css/redesign.css

@@ -734,8 +734,8 @@
   }
   
   /* Aktion */
-  .gc-table th:nth-child(13),
-  .gc-table td:nth-child(13) {
+  .gc-table th:nth-child(12),
+  .gc-table td:nth-child(12) {
     width: 54px;
   }
   
@@ -747,78 +747,72 @@
     white-space: normal !important;
   }
   
-  /* Kunde */
+  /* Verursacher */
   .gc-table th:nth-child(2),
   .gc-table td:nth-child(2) {
-    width: 230px;
-    min-width: 230px;
-    padding-left: 8px !important;
-  }
-  
-  /* Verursacher */
-  .gc-table th:nth-child(3),
-  .gc-table td:nth-child(3) {
     width: 145px;
     min-width: 145px;
     padding-left: 6px !important;
   }
   
   /* RG-Nr. */
-  .gc-table th:nth-child(4),
-  .gc-table td:nth-child(4) {
+  .gc-table th:nth-child(3),
+  .gc-table td:nth-child(3) {
     width: 118px;
   }
   
   /* RG-Datum / Fällig */
-  .gc-table th:nth-child(5),
-  .gc-table td:nth-child(5) {
+  .gc-table th:nth-child(4),
+  .gc-table td:nth-child(4) {
     width: 120px;
   }
   
-  /* RG-Betrag */
+  /* Kunde */
+  .gc-table th:nth-child(5),
+  .gc-table td:nth-child(5) {
+    width: 230px;
+    min-width: 230px;
+    padding-left: 8px !important;
+  }  
+
+  /* offen / Kunde ges. */
   .gc-table th:nth-child(6),
   .gc-table td:nth-child(6) {
-    width: 105px;
+    width: 155px;
   }
   
-  /* offen / Kunde ges. */
+  /* Mahnstufe / Staffel */
   .gc-table th:nth-child(7),
   .gc-table td:nth-child(7) {
-    width: 155px;
+    width: 125px;
   }
   
-  /* Mahnstufe / Staffel */
+  /* Abw. */
   .gc-table th:nth-child(8),
   .gc-table td:nth-child(8) {
-    width: 125px;
+    width: 80px;
   }
   
-  /* Abw. */
+  /* Kommentar Fibu */
   .gc-table th:nth-child(9),
   .gc-table td:nth-child(9) {
-    width: 80px;
+    width: 165px;
   }
   
-  /* Kommentar Fibu */
+  /* Kommentar Abteilung */
   .gc-table th:nth-child(10),
   .gc-table td:nth-child(10) {
     width: 165px;
   }
   
-  /* Kommentar Abteilung */
+  /* Wiedervorlage */
   .gc-table th:nth-child(11),
   .gc-table td:nth-child(11) {
-    width: 165px;
-  }
-  
-  /* Wiedervorlage */
-  .gc-table th:nth-child(12),
-  .gc-table td:nth-child(12) {
     width: 120px;
   }
   
   /* Abw. wieder im alten Gelb */
-  .gc-table td:nth-child(9) .gc-badge-warning {
+  .gc-table td:nth-child(8) .gc-badge-warning {
     background: #fef3c7 !important;
     color: #92400e !important;
     border-color: #fde68a !important;
@@ -828,9 +822,9 @@
    EDIT BUTTON LINKS HELLER
 ========================================================= */
 
-.gc-table td:first-child button,
-.gc-table td:first-child .btn,
-.gc-table td:first-child a {
+.gc-table td:nth-child(12) button,
+.gc-table td:nth-child(12) .btn,
+.gc-table td:nth-child(12) a {
   width: 34px;
   height: 34px;
   border-radius: 12px !important;
@@ -852,9 +846,9 @@
 }
 
 /* Hover */
-.gc-table td:first-child button:hover,
-.gc-table td:first-child .btn:hover,
-.gc-table td:first-child a:hover {
+.gc-table td:nth-child(12) button:hover,
+.gc-table td:nth-child(12) .btn:hover,
+.gc-table td:nth-child(12) a:hover {
   background: linear-gradient(
     180deg,
     #a8b9c9 0%,
@@ -865,8 +859,8 @@
 }
 
 /* Icon */
-.gc-table td:first-child i,
-.gc-table td:first-child svg {
+.gc-table td:nth-child(12) i,
+.gc-table td:nth-child(12) svg {
   color: #ffffff !important;
   font-size: .9rem;
 }

+ 2 - 2
templates/forderungen/liste/config/liste_filter.csv

@@ -1,6 +1,6 @@
 Name;Filter_Typ;Breite;Beschriftung;Tabellenfeld;Anzeigewert;Sortierung;Standardwert
-Hauptbetrieb;select;2;;Client_DB;Hauptbetrieb_Name;;
-Standort;select;3;;Standort_ID;Standort_Name;;
+Mandant;select;2;;Client_DB;Hauptbetrieb_Name;;
+Filiale;select;3;;Standort_ID;Standort_Name;;
 Bereich;select;3;;;;;
 Verursacher;select;4;;Verursacher_Text;;;
 Rechnungsnummer;text;2;;Beleg_Nr;;;

+ 2 - 3
templates/forderungen/liste/liste_kopfzeile.html

@@ -1,10 +1,9 @@
     <tr>
         <th>Filiale / Bereich</th>
-        <th>Kunde</th>
         <th>Verursacher</th>
-        <th>RG-Nr.</th>
+        <th>RG-Betrag<br>/ RG-Nr.</th>
         <th>RG-Datum<br>/ Fällig</th>
-        <th>RG-Betrag</th>
+        <th>Kunde</th>
         <th>offen /<br>Kunde ges.</th>
         <th>Mahnstufe<br>/ Staffel</th>
         <th>Abw.</th>

+ 12 - 15
templates/forderungen/liste/liste_zeile.html

@@ -4,18 +4,6 @@
     <div class="gc-subtitle">{{ row.Bereich }}</div>
   </td>
 
-  <td class="gc-main-cell">
-    <a class="gc-title text-decoration-none" href="/app/forderungen/liste?Kunde={{ row.Kunde_Text|urlencode }}">
-      {{ row.Kunde_Text }}
-    </a>
-    <div class="gc-subtitle">
-      {{ row.Besitzer_Kunde_Text or '' }}
-      {% if row.Kunde_Email %}
-      · <a href="mailto:{{ row.Kunde_Email }}?subject={{ row.Beleg_Nr }}" hx-disable="true">E-Mail</a>
-      {% endif %}
-    </div>
-  </td>
-
   <td>
     <a href="/app/forderungen/liste?Verursacher={{ row.Verursacher_Text|urlencode }}"
       class="text-decoration-none fw-semibold">
@@ -26,7 +14,8 @@
     {% endif %}
   </td>
 
-  <td>
+  <td class="text-end align-top">
+    <div class="gc-money">{{ row.Beleg_Betrag|number_format }} €</div>
     <a href="#" data-coreui-toggle="modal" data-coreui-target="#exampleModal">
       <span class="gc-badge gc-badge-info">{{ row.Beleg_Nr }}</span>
     </a>
@@ -37,8 +26,16 @@
     <div class="gc-subtitle">fällig {{ row.Fällig_Datum|date_format }}</div>
   </td>
 
-  <td class="text-end align-top">
-    <div class="gc-money">{{ row.Beleg_Betrag|number_format }} €</div>
+  <td class="gc-main-cell">
+    <a class="gc-title text-decoration-none" href="/app/forderungen/liste?Kunde={{ row.Kunde_Text|urlencode }}">
+      {{ row.Kunde_Text }}
+    </a>
+    <div class="gc-subtitle">
+      {{ row.Besitzer_Kunde_Text or '' }}
+      {% if row.Kunde_Email %}
+      · <a href="mailto:{{ row.Kunde_Email }}?subject={{ row.Beleg_Nr }}" hx-disable="true">E-Mail</a>
+      {% endif %}
+    </div>
   </td>
 
   <td class="text-end">