Jelajahi Sumber

Diverse UI Anpassungen

gc-server3 2 hari lalu
induk
melakukan
b3a46dcaaf

+ 71 - 2
static/assets/css/main.css

@@ -36,7 +36,7 @@ body {
 */
 
 .chat-container {
-    width: 700px;
+    /* width: 700px; */
     height: 900px;
     display: flex;
     flex-direction: column;
@@ -816,4 +816,73 @@ a {
   position: sticky;
   top: 40px;
   background: white;
-}
+}
+
+
+      .chat-input {
+            padding: 15px 20px;
+            border-top: 1px solid var(--border);
+            display: flex;
+            align-items: center;
+            background-color: white;
+            position: relative;
+            z-index: 10;
+        }
+
+        .input-container {
+            flex: 1;
+            display: flex;
+            align-items: center;
+            background-color: var(--secondary);
+            border-radius: 20px;
+            padding: 0 15px;
+            position: relative;
+        }
+
+        .input-container input {
+            flex: 1;
+            border: none;
+            outline: none;
+            height: 40px;
+            background-color: transparent;
+            padding: 0 10px;
+            font-size: 15px;
+        }
+
+        .input-actions {
+            display: flex;
+            gap: 10px;
+        }
+
+        .input-btn {
+            background: none;
+            border: none;
+            color: #888;
+            cursor: pointer;
+            transition: var(--transition);
+            font-size: 18px;
+        }
+
+        .input-btn:hover {
+            color: var(--primary);
+        }
+
+        .send-btn {
+            background-color: var(--primary);
+            color: white;
+            width: 40px;
+            height: 40px;
+            border-radius: 50%;
+            border: none;
+            cursor: pointer;
+            margin-left: 10px;
+            transition: var(--transition);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        .send-btn:hover {
+            background-color: var(--primary-light);
+            transform: scale(1.05);
+        }

+ 59 - 59
static/assets/css/redesign.css

@@ -459,7 +459,7 @@
   
   /* Chat / Timeline */
   
-  .gc-detail-main .chat-container {
+  .gc-detail-main .chat-container2 {
     height: calc(100vh - var(--gc-topbar-height) - 15rem);
     max-height: 620px;
     min-height: 420px;
@@ -472,7 +472,7 @@
     overflow: hidden;
   }
   
-  .chat-container .header {
+  .chat-container2 .header {
     flex: 0 0 auto;
     display: flex;
     align-items: center;
@@ -482,14 +482,14 @@
     border-bottom: 1px solid #e5e7eb;
   }
   
-  .chat-container .header-left {
+  .chat-container2 .header-left {
     display: flex;
     align-items: center;
     gap: .75rem;
     min-width: 0;
   }
   
-  .chat-container .avatar {
+  .chat-container2 .avatar {
     width: 32px;
     height: 32px;
     flex: 0 0 32px;
@@ -504,7 +504,7 @@
     overflow: hidden;
   }
   
-  .chat-container .course-title {
+  .chat-container2 .course-title {
     font-size: .95rem;
     font-weight: 850;
     color: #111827;
@@ -514,19 +514,19 @@
     text-overflow: ellipsis;
   }
   
-  .chat-container .course-participants {
+  .chat-container2 .course-participants {
     margin-top: .1rem;
     font-size: .76rem;
     color: #64748b;
   }
   
-  .chat-container .header-actions {
+  .chat-container2 .header-actions {
     display: flex;
     align-items: center;
     gap: .35rem;
   }
   
-  .chat-container .icon-button {
+  .chat-container2 .icon-button {
     width: 32px;
     height: 32px;
     border: 1px solid #e5e7eb;
@@ -538,13 +538,13 @@
     justify-content: center;
   }
   
-  .chat-container .icon-button:hover {
+  .chat-container2 .icon-button:hover {
     background: #eef2f7;
     color: #334155;
     border-color: #cbd5e1;
   }
   
-  .chat-container .tabs {
+  .chat-container2 .tabs {
     flex: 0 0 auto;
     display: flex;
     gap: .35rem;
@@ -554,7 +554,7 @@
     overflow-x: auto;
   }
   
-  .chat-container .tab {
+  .chat-container2 .tab {
     padding: .38rem .65rem;
     border-radius: 999px;
     font-size: .75rem;
@@ -563,12 +563,12 @@
     white-space: nowrap;
   }
   
-  .chat-container .tab.active {
+  .chat-container2 .tab.active {
     background: #64748b;
     color: #ffffff;
   }
   
-  .chat-container .chat-content {
+  .chat-container2 .chat-content {
     flex: 1;
     min-height: 0;
     overflow-y: auto;
@@ -576,20 +576,20 @@
     background: linear-gradient(180deg, #ffffff 0%, #f8fafc 100%);
   }
   
-  .chat-container .date-divider {
+  .chat-container2 .date-divider {
     display: flex;
     align-items: center;
     gap: .75rem;
     margin: .4rem 0 1rem;
   }
   
-  .chat-container .divider-line {
+  .chat-container2 .divider-line {
     flex: 1;
     height: 1px;
     background: #e5e7eb;
   }
   
-  .chat-container .divider-text {
+  .chat-container2 .divider-text {
     font-size: .7rem;
     font-weight: 850;
     color: #64748b;
@@ -597,43 +597,43 @@
     letter-spacing: .04em;
   }
   
-  .chat-container .message {
+  .chat-container2 .message {
     max-width: 78%;
     margin-bottom: .85rem;
   }
   
-  .chat-container .message.teacher,
-  .chat-container .message.Fibu,
-  .chat-container .message.fibu {
+  .chat-container2 .message.teacher,
+  .chat-container2 .message.Fibu,
+  .chat-container2 .message.fibu {
     margin-right: auto;
   }
   
-  .chat-container .message.student,
-  .chat-container .message.Abteilung,
-  .chat-container .message.abteilung {
+  .chat-container2 .message.student,
+  .chat-container2 .message.Abteilung,
+  .chat-container2 .message.abteilung {
     margin-left: auto;
   }
   
-  .chat-container .message-header {
+  .chat-container2 .message-header {
     display: flex;
     align-items: center;
     gap: .45rem;
     margin-bottom: .3rem;
   }
   
-  .chat-container .sender-name {
+  .chat-container2 .sender-name {
     font-size: .76rem;
     font-weight: 850;
     color: #334155;
   }
   
-  .chat-container .timestamp {
+  .chat-container2 .timestamp {
     font-size: .7rem;
     color: #94a3b8;
     margin-left: .25rem;
   }
   
-  .chat-container .message-bubble {
+  .chat-container2 .message-bubble {
     display: inline-block;
     padding: .65rem .85rem;
     border-radius: 15px;
@@ -645,23 +645,23 @@
     box-shadow: 0 3px 10px rgba(15, 23, 42, .04);
   }
   
-  .chat-container .message.student .message-bubble,
-  .chat-container .message.Abteilung .message-bubble,
-  .chat-container .message.abteilung .message-bubble {
+  .chat-container2 .message.student .message-bubble,
+  .chat-container2 .message.Abteilung .message-bubble,
+  .chat-container2 .message.abteilung .message-bubble {
     background: #f8fafc;
     color: #172033;
     border-color: #cbd5e1;
   }
   
-  .chat-container .message.teacher .message-bubble,
-  .chat-container .message.Fibu .message-bubble,
-  .chat-container .message.fibu .message-bubble {
+  .chat-container2 .message.teacher .message-bubble,
+  .chat-container2 .message.Fibu .message-bubble,
+  .chat-container2 .message.fibu .message-bubble {
     background: #ffffff;
     color: #172033;
     border-color: #e2e8f0;
   }
   
-  .chat-container .input-area {
+  .chat-container2 .input-area {
     flex: 0 0 auto;
     min-height: 46px;
     padding: .6rem .85rem;
@@ -669,13 +669,13 @@
     border-top: 1px solid #e5e7eb;
   }
   
-  .chat-container .toolbar {
+  .chat-container2 .toolbar {
     display: flex;
     align-items: center;
     gap: .5rem;
   }
   
-  .chat-container .tool-button {
+  .chat-container2 .tool-button {
     width: 32px;
     height: 32px;
     border-radius: 10px;
@@ -700,7 +700,7 @@
       position: static !important;
     }
   
-    .gc-detail-main .chat-container {
+    .gc-detail-main .chat-container2 {
       height: auto;
       min-height: 520px;
       max-height: none;
@@ -874,42 +874,42 @@
    DETAILSEITE: CHATVERLAUF OPTISCH AUFWERTEN
 ========================================================= */
 
-.chat-container {
+.chat-container2 {
     background: #ffffff !important;
     border-radius: 22px !important;
     overflow: hidden;
   }
   
-  .chat-container .chat-content {
+  .chat-container2 .chat-content {
     background:
       radial-gradient(circle at top left, rgba(148, 163, 184, .16), transparent 22rem),
       linear-gradient(180deg, #f8fafc 0%, #f1f5f9 100%) !important;
     padding: 1.25rem 1.5rem !important;
   }
   
-  .chat-container .date-divider {
+  .chat-container2 .date-divider {
     margin: 1.25rem 0 1.5rem !important;
   }
   
-  .chat-container .divider-line {
+  .chat-container2 .divider-line {
     background: #cbd5e1 !important;
   }
   
-  .chat-container .divider-text {
+  .chat-container2 .divider-text {
     color: #64748b !important;
     font-weight: 900 !important;
     font-size: .76rem !important;
   }
   
-  .chat-container .message {
+  .chat-container2 .message {
     margin-bottom: 1.15rem !important;
   }
   
-  .chat-container .message-header {
+  .chat-container2 .message-header {
     margin-bottom: .4rem !important;
   }
   
-  .chat-container .message-header .avatar {
+  .chat-container2 .message-header .avatar {
     width: 34px !important;
     height: 34px !important;
     min-width: 34px !important;
@@ -921,18 +921,18 @@
     text-transform: uppercase;
   }
   
-  .chat-container .sender-name {
+  .chat-container2 .sender-name {
     color: #172033 !important;
     font-weight: 850 !important;
     font-size: .86rem !important;
   }
   
-  .chat-container .timestamp {
+  .chat-container2 .timestamp {
     color: #94a3b8 !important;
     font-size: .72rem !important;
   }
   
-  .chat-container .message-bubble {
+  .chat-container2 .message-bubble {
     background: #ffffff !important;
     color: #1e293b !important;
     border: 1px solid #dbe3ee !important;
@@ -942,39 +942,39 @@
     line-height: 1.45 !important;
   }
   
-  .chat-container .message-bubble:hover {
+  .chat-container2 .message-bubble:hover {
     border-color: #cbd5e1 !important;
     box-shadow: 0 8px 22px rgba(15, 23, 42, .09) !important;
   }
   
   /* Nachrichten rechts / Abteilung etwas anders einfärben */
-  .chat-container .message.student .message-bubble,
-  .chat-container .message.Abteilung .message-bubble,
-  .chat-container .message.abteilung .message-bubble {
+  .chat-container2 .message.student .message-bubble,
+  .chat-container2 .message.Abteilung .message-bubble,
+  .chat-container2 .message.abteilung .message-bubble {
     background: #f8fafc;
     border-color: #e2e8f0;
     border-radius: 16px 16px 6px 16px !important;
   }
   
   /* Fibu / Standard links */
-  .chat-container .message.teacher .message-bubble,
-  .chat-container .message.Fibu .message-bubble,
-  .chat-container .message.fibu .message-bubble {
+  .chat-container2 .message.teacher .message-bubble,
+  .chat-container2 .message.Fibu .message-bubble,
+  .chat-container2 .message.fibu .message-bubble {
     background: #ffffff !important;
   }
   
   /* Tabs schöner */
-  .chat-container .tabs {
+  .chat-container2 .tabs {
     background: #f8fafc !important;
     border-bottom: 1px solid #e2e8f0 !important;
   }
   
-  .chat-container .tab {
+  .chat-container2 .tab {
     color: #64748b !important;
     font-weight: 850 !important;
   }
   
-  .chat-container .tab.active {
+  .chat-container2 .tab.active {
     background: #64748b !important;
     color: #ffffff !important;
     box-shadow: 0 4px 10px rgba(15, 23, 42, .10) !important;
@@ -1111,7 +1111,7 @@ body {
   }
   
   /* Chat bleibt trotzdem intern scrollbar */
-  .gc-detail-main .chat-container {
+  .gc-detail-main .chat-container2 {
     overflow: hidden !important;
   }
   

+ 14 - 8
templates/base/base.html

@@ -59,23 +59,23 @@
           <i class="icon icon-lg cil-menu"></i>
         </button>
         <ul class="header-nav d-none d-lg-flex">
-          <li class="nav-item"><a class="nav-link" href="/select">Übersicht</a></li>
           <li class="nav-item"><a class="nav-link" href="/app/forderungen/liste">Liste</a></li>
           <li class="nav-item"><a class="nav-link" href="/app/forderungen/dashboard">Dashboard</a></li>
-          <li class="nav-item"><a class="nav-link" href="#">Einstellungen</a></li>
         </ul>
         <ul class="header-nav ms-auto">
-          <li class="nav-item"><a class="nav-link" href="#">
-              <i class="icon icon-lg cil-bell"></i></a></li>
-          <li class="nav-item"><a class="nav-link" href="#">
-              <i class="icon icon-lg cil-list-rich"></i></a></li>
-          <li class="nav-item"><a class="nav-link" href="#">
-              <i class="icon icon-lg cil-envelope-open"></i></a></li>
+          <li class="nav-item"><a class="nav-link" href="/select">
+              <i class="icon icon-lg cil-home"></i></a></li>
+          <li class="nav-item"><a class="nav-link" href="/config">
+              <i class="icon icon-lg cil-cog"></i></a></li>
+          <li class="nav-item"><a class="nav-link" href="/logout">
+              <i class="icon icon-lg cil-user"></i></a></li>
         </ul>
+        <!--
         <ul class="header-nav">
           <li class="nav-item py-1">
             <div class="vr h-100 mx-2 text-body text-opacity-75"></div>
           </li>
+
           <li class="nav-item dropdown">
             <button class="btn btn-link nav-link py-2 px-2 d-flex align-items-center" type="button"
               aria-expanded="false" data-coreui-toggle="dropdown">
@@ -134,9 +134,15 @@
             </div>
           </li>
         </ul>
+        -->
       </div>
     </header>
     <main role="main" class="gc-page">
+      <div class="container-fluid px-6">
+        <img src="/static/assets/images/Reisacher.png">
+        <!--<strong>Forderungsmanagement</strong>-->
+      </div>
+
       {% block content %}{% endblock %}
     </main>
   </div>

+ 47 - 5
templates/base/chat_container.html

@@ -44,7 +44,7 @@
         <div class="tab active">Diese Rechnung</div>
         <div class="tab">Alle offenen Rechnungen</div>
         <div class="tab">Dieses Fahrzeug</div>
-        <div class="tab">Gesamte Historie</div>
+        <div class="tab">Debitor Historie</div>
     </div>
     <div class="chat-content" id="chatContent">
         <div class="date-divider">
@@ -52,7 +52,7 @@
             <div class="divider-text">{{ forderung_kopf[0].Invoice_Date|date_format }}</div>
             <div class="divider-line"></div>
         </div>
-<!--
+        <!--
         <div class="message teacher">
             <div class="message-header">
                 <div class="avatar">DKI</div>
@@ -108,7 +108,7 @@
             </div>
         </div>
         {% endfor %}
-<!--
+        <!--
         <div class="message student">
             <div class="message-header">
                 <div class="avatar">CVE</div>
@@ -415,8 +415,50 @@
     </div>
     <div class="input-area">
         <div class="toolbar">
-            <button class="tool-button tooltip" data-tooltip="Attach File">
+            
+            <button class="btn btn-primary">
+                <i class="icon icon-lg cil-paperclip"></i>
             </button>
+            <input type="text" class="message-input" id="comment" name="comment" placeholder="Kommentieren ..." autofocus="autofocus"></textarea>
+            <button class="btn btn-primary">
+                <i class="icon icon-lg cil-chevron-right"></i>
+            </button>
+
+
+
+
+            <div class="chat-input" style="display: none;">
+                <div class="input-container">
+                    <div class="input-actions">
+                        <button class="btn input-btn" id="attachBtn" title="Attach file">
+                            <i class="icon icon-lg cil-paperclip"></i>
+                        </button>
+                    </div>
+                    <input type="text" id="messageInput" placeholder="Type a message, use # for tasks, @ for people...">
+                </div>
+                <button class="send-btn" id="sendBtn">
+                    <i class="icon icon-lg cil-chevron-right"></i>
+                </button>
+
+                <!-- File Upload Preview -->
+                <div class="file-preview" id="filePreview" style="display:none;">
+                    <div class="file-preview-header">
+                        <span>File to upload</span>
+                        <button class="file-preview-close" onclick="closeFilePreview()">
+                            <i class="fas fa-times"></i>
+                        </button>
+                    </div>
+                    <div class="file-preview-content">
+                        <div class="file-preview-icon">
+                            <i class="fas fa-file"></i>
+                        </div>
+                        <div class="file-preview-details">
+                            <div class="file-preview-name">document.pdf</div>
+                            <div class="file-preview-size">3.2 MB</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
-</div>
+</div>

+ 3 - 3
templates/base/login.html

@@ -41,7 +41,7 @@
 			<div class="row align-items-center">
 				<div class="col-md-6">
 					<div class="card-body">
-						<h2 class="mb-4">Global Cube<br> <span class="text-c-blue">Datenverfeinerungsplattform</span></h2>
+						<h2 class="mb-4">Reisacher<br> <span class="text-c-blue">Forderungsmanagement 2.0</span></h2>
 						<p>Aus Freude am Zahlen.</p>
 						<div class="toggle-block">
 							<ol class="position-relative carousel-indicators justify-content-start">
@@ -68,8 +68,8 @@
 								</div>
 							</div> -->
 							<a href="/select"><button class="btn btn-primary mb-4">Anmelden</button></a>
-							<button class="btn btn-primary btn-outline-primary mb-4 toggle-btn">Registrieren</button>
-							<p class="mb-2 text-muted">Passwort vergessen? <a href="reset-password.html" class="f-w-400">Hier zur&uuml;cksetzen</a></p>
+							
+							
 						</div>
 						<div class="toggle-block collapse">
 							<ol class="position-relative carousel-indicators justify-content-start">

+ 36 - 89
templates/forderungen/details/details.html

@@ -5,115 +5,62 @@
 <h2>{{forderung_kopf[0].Beleg }}</h2>
 <br>
 
-{%include 'forderungen/details/details_uebersicht.html' %}
+<div class="row g-3">
 
-{%include 'forderungen/details/details_kommentare.html' %}
+<div class="col-3">
+
+  {%include 'forderungen/details/details_uebersicht.html' %}
+
+</div>
 
-<br>
-<br>
 
-<div class="row g-3">
 <div class="col-5">
 
   {%include 'base/chat_container.html' %}
 
-</div>
-<div class="col-1">
-  &nbsp;
+  <br>
+  <br>
+
+  <h3>Dateien</h3>
+
+  {%include 'forderungen/details/details_dateien.html' %}
+
 </div>
 
-<div class="col-6">
+<div class="col-4">
 
 {%include 'forderungen/details/details_formular.html' %}
 
+<br>
+<br>
+
+<h3>Auftragspositionen</h3>
+
+{%include 'forderungen/details/details_positionen.html' %}
+
 </div>
 </div>
 <br>
 <br>
 
-<div class="accordion accordion-flush" id="accordionFlushExample">
-  <div class="accordion-item">
-    <h2 class="accordion-header">
-      <button class="accordion-button collapsed" type="button" data-coreui-toggle="collapse"
-        data-coreui-target="#flush-collapseOne" aria-expanded="false" aria-controls="flush-collapseOne">
-        <h3>Dateien</h3>
-      </button>
-    </h2>
-    <div id="flush-collapseOne" class="accordion-collapse collapse" data-coreui-parent="#accordionFlushExample">
-      <div class="accordion-body">
-
-        {%include 'forderungen/details/details_dateien.html' %}
-
-      </div>
-    </div>
-  </div>
-
-  <div class="accordion-item">
-    <h2 class="accordion-header">
-      <button class="accordion-button collapsed" type="button" data-coreui-toggle="collapse"
-        data-coreui-target="#flush-collapseTwo" aria-expanded="false" aria-controls="flush-collapseTwo">
-        <h3>Forderung Details</h3>
-      </button>
-    </h2>
-    <div id="flush-collapseTwo" class="accordion-collapse collapse" data-coreui-parent="#accordionFlushExample">
-      <div class="accordion-body">
-
-        {%include 'forderungen/details/details_rohdaten.html' %}
-
-      </div>
-    </div>
-  </div>
-  <div class="accordion-item">
-    <h2 class="accordion-header">
-      <button class="accordion-button collapsed" type="button" data-coreui-toggle="collapse"
-        data-coreui-target="#flush-collapseThree" aria-expanded="false" aria-controls="flush-collapseThree">
-        <h3>Mahnungen</h3>
-      </button>
-    </h2>
-    <div id="flush-collapseThree" class="accordion-collapse collapse" data-coreui-parent="#accordionFlushExample">
-      <div class="accordion-body">
-
-        {%include 'forderungen/details/details_mahnungen.html' %}
-
-      </div>
-    </div>
-  </div>
-
-
-  <div class="accordion-item">
-    <h2 class="accordion-header">
-      <button class="accordion-button collapsed" type="button" data-coreui-toggle="collapse"
-        data-coreui-target="#flush-collapseFour" aria-expanded="false" aria-controls="flush-collapseFour">
-        <h3>Auftragspositionen</h3>
-      </button>
-    </h2>
-    <div id="flush-collapseFour" class="accordion-collapse collapse" data-coreui-parent="#accordionFlushExample">
-      <div class="accordion-body">
-
-        {%include 'forderungen/details/details_positionen.html' %}
-        
-      </div>
-    </div>
-  </div>
-
-
-  <div class="accordion-item">
-    <h2 class="accordion-header">
-      <button class="accordion-button collapsed" type="button" data-coreui-toggle="collapse"
-        data-coreui-target="#flush-collapseFive" aria-expanded="false" aria-controls="flush-collapseFive">
-        <h3>Buchungsbelege</h3>
-      </button>
-    </h2>
-    <div id="flush-collapseFive" class="accordion-collapse collapse" data-coreui-parent="#accordionFlushExample">
-      <div class="accordion-body">
+{%include 'forderungen/details/details_kommentare.html' %}
 
-        {%include 'forderungen/details/details_buchungen.html' %}
+<br>
+<br>
 
-      </div>
-    </div>
-  </div>
 
-</div>
+<h3>Mahnungen</h3>
+
+{%include 'forderungen/details/details_mahnungen.html' %}
+
+<br>
+<br>
+
+
+<h3>Buchungsbelege</h3>
+
+        {%include 'forderungen/details/details_buchungen.html' %}
+
 
 
 {% endblock %}

+ 7 - 0
templates/forderungen/details/details_buchungen.html

@@ -1,3 +1,10 @@
+<div class="tabs">
+    <div class="tab">Diese Rechnung</div>
+    <div class="tab">Alle offenen Rechnungen</div>
+    <div class="tab">Dieses Fahrzeug</div>
+    <div class="tab active">Debitor Historie</div>
+</div>
+
 <table class="table table-striped table-bordered">
     <thead>
         <tr>

+ 4 - 0
templates/forderungen/details/details_formular.html

@@ -162,6 +162,10 @@
   <div class="collapse {{ forderung_kopf[0].Mahnen_aussetzen|show }}" id="MahnenCollapse">
     <div class="card card-body">
       <div class="row mb-3">
+        <p>
+          Dieser Beleg wird beim nächsten Mahnlauf nicht angemahnt.
+        </p>
+
         <label for="Mahnen_Begründung" class="col-sm-3 col-form-label">Begründung</label>
         <div class="col-sm-5">
 

+ 7 - 0
templates/forderungen/details/details_mahnungen.html

@@ -1,3 +1,10 @@
+<div class="tabs">
+    <div class="tab">Diese Rechnung</div>
+    <div class="tab">Alle offenen Rechnungen</div>
+    <div class="tab">Dieses Fahrzeug</div>
+    <div class="tab active">Debitor Historie</div>
+</div>
+
 <table class="table table-striped table-bordered">
     <thead>
         <tr>

+ 8 - 8
templates/forderungen/details/details_uebersicht.html

@@ -1,6 +1,6 @@
 
 <div class="row mb-3">
-  <div class="col-4">
+  <div>
     <table class="table table-sm">
       <tr>
         <th colspan="2">Grunddaten</th>
@@ -31,7 +31,7 @@
 
     </table>
   </div>
-  <div class="col-4">
+  <div>
     <table class="table table-sm">
       <tr>
         <th colspan="2">Beleg</th>
@@ -65,7 +65,7 @@
 
     </table>
   </div>
-  <div class="col-4">
+  <div>
     <table class="table table-sm">
       <tr>
         <th colspan="2">Forderung</th>
@@ -98,7 +98,7 @@
   </div>
 
 
-  <div class="col-4">
+  <div>
     <table class="table table-sm">
       <tr>
         <th colspan="2">Kunde</th>
@@ -152,7 +152,7 @@
     </table>
   </div>
 {% if forderung_kopf[0].Fahrzeug_Leasing == 'J' %}
-<div class="col-4">
+<div>
     <table class="table table-sm">
       <tr>
         <th colspan="2">Leasing-Kunde</th>
@@ -198,7 +198,7 @@
 
 
 {% if forderung_kopf[0].Versicherung == 'J' and forderung_kopf[0].Vers_Adresse_ID != '' %}
-  <div class="col-4">
+  <div>
     <table class="table table-sm">
       <tr>
         <th colspan="2">Versicherung</th>
@@ -242,7 +242,7 @@
 {% endif %}
 
 
-  <div class="col-4">
+  <div>
     <table class="table table-sm">
       <tr>
         <th colspan="2">Fahrzeug</th>
@@ -303,7 +303,7 @@
       </tr>
 
       <tr>
-        <td><strong>Fahrzeug_Vorbesitzer_Anzahl:</strong></td>
+        <td><strong>Anzahl Vorbesitzer:</strong></td>
         <td>{{forderung_kopf[0].Fahrzeug_Vorbesitzer_Anzahl }}</td>
       </tr>
 

+ 4 - 4
templates/forderungen/liste/liste_zeile.html

@@ -16,7 +16,7 @@
       {{ row.Kunde }}
     </a>
     <div class="gc-subtitle">
-      {{ row.Document_No }}
+      {{ row.Kunde2 or '' }}
       {% if row.Kunde_Email %}
       · <a href="mailto:{{ row.Kunde_Email }}?subject={{ row.Document_No }}" hx-disable="true">E-Mail</a>
       {% endif %}
@@ -43,12 +43,12 @@
   </td>
 
   <td class="text-end align-top">
-    <div class="gc-money">{{ row.offen|number_format }} €</div>
+    <div class="gc-money">{{ row.Beleg_Betrag|number_format }} €</div>
   </td>
 
   <td class="text-end">
     <div class="gc-money">{{ row.offen|number_format }} €</div>
-    <div class="gc-subtitle">Kunde {{ row.offen_Kunde_gesamt|number_format }} €</div>
+    <div class="gc-subtitle">{{ row.Kunde_gesamt_Bezug }} {{ row.offen_Kunde_gesamt|number_format }} €</div>
   </td>
 
   <td class="text-end">
@@ -59,7 +59,7 @@
       M{{ mahnstufe }}
     </span>
     {% endif %}
-    <div class="gc-subtitle">Staffel {{ row.Staffel }}</div>
+    <div class="gc-subtitle">{{ row.Tage }} Tage</div>
   </td>
 
   <td class="text-end">