Folding lists and opened variables

back/app/contract/models.py

@@ -190,7 +190,7 @@ class Contract(CrudDocument):
             for p in values['parties']:
                 contract_label = contract_label + f" - {p.entity.label}"
 
-            contract_label = contract_label + f" {values['date'].strftime('%m/%d/%Y')}"
+            contract_label = contract_label + f" - {values['date'].strftime('%m/%d/%Y')}"
             return contract_label
 
         return v

back/app/contract/print/__init__.py

@@ -130,7 +130,7 @@ async def create_pdf(contract_id: str) -> str:
     return FileResponse(
         contract_path,
         media_type="application/pdf",
-        filename=contract.name)
+        filename=contract.label)
 
 
 def retrieve_signature_png(filepath):

back/app/contract/print/templates/styles.css

@@ -117,6 +117,10 @@ p {
     text-align: justify;
 }
 
+li {
+    margin: 16px 0;
+}
+
 .footer {
     margin-top: 30px;
     page-break-inside: avoid;

front/app/src/app/views/contracts/contracts.component.ts

@@ -78,37 +78,22 @@ export class ContractsCardComponent extends BaseContractsComponent{
 
 @Component({
     template: `
-        <ngb-accordion #acc="ngbAccordion" activeIds="ngb-panel-1">
-            <ngb-panel>
-                <ng-template ngbPanelTitle>
-                    <span i18n>Preview</span>
-                </ng-template>
-                <ng-template ngbPanelContent>
-                    <iframe width="100%" 
-                            [src]="getPreview()" 
-                            onload='javascript:(function(o){o.style.height=o.contentWindow.document.body.scrollHeight+"px";o.style.width=o.contentWindow.document.body.scrollWidth+"px";}(this));' style="height:200px;width:100%;border:none;overflow:hidden;"></iframe>
-                </ng-template>
-            </ngb-panel>
-            <ngb-panel>
-                <ng-template ngbPanelTitle>
-                    <span i18n>Signature</span>
-                </ng-template>
-                <ng-template ngbPanelContent>
-                    <ng-container *ngIf="this.affixed"><ng-container i18n>This Contract has already been signed by</ng-container> {{ this.signatory }}</ng-container>
-                    <div class="row" *ngIf="!this.affixed">
-                        <signature-drawer class="col-7"
-                         (signatureDrawn$)="postSignature($event)"></signature-drawer>
-                        <div class="col-5" i18n>
-                            <p>Cette page est à la destination exclusive de <strong>{{ this.signatory }}</strong></p>
-                            <p>Si vous n'êtes <strong>pas</strong> {{ this.signatory }}, veuillez <strong>fermer cette page immédiatement</strong> et surpprimer tous les liens en votre possession menant vers celle-ci.</p>
-                            <p>En vous maintenant et/ou en interagissant avec cette page, vous enfreignez l'article L.229 du code pénal de l'Etat de San Andreas pour <strong>usurpation d'identité</strong> et vous vous exposez ainsi à une amende de 20 000$ ainsi qu'à des poursuites civiles.</p>
-                            <p>Le cabinet Cooper, Hillman & Toshi LLC</p>
-                        </div>
-                    </div>
-                </ng-template>
-            </ngb-panel>
-        </ngb-accordion>
-    `
+        <div>
+            <iframe width="100%" 
+                    [src]="getPreview()" 
+                    onload='javascript:(function(o){o.style.height=o.contentWindow.document.body.scrollHeight+"px";o.style.width=o.contentWindow.document.body.scrollWidth+"px";}(this));' style="height:200px;width:100%;border:none;overflow:hidden;">
+            </iframe>
+        </div>
+        <div class="row" *ngIf="!this.affixed">
+            <signature-drawer class="col-7"
+             (signatureDrawn$)="postSignature($event)"></signature-drawer>
+            <div class="col-5" i18n>
+                <p>Cette page est à la destination exclusive de <strong>{{ this.signatory }}</strong></p>
+                <p>Si vous n'êtes <strong>pas</strong> {{ this.signatory }}, veuillez <strong>fermer cette page immédiatement</strong> et surpprimer tous les liens en votre possession menant vers celle-ci.</p>
+                <p>En vous maintenant et/ou en interagissant avec cette page, vous enfreignez l'article L.229 du code pénal de l'Etat de San Andreas pour <strong>usurpation d'identité</strong> et vous vous exposez ainsi à une amende de 20 000$ ainsi qu'à des poursuites civiles.</p>
+                <p>Le cabinet Cooper, Hillman & Toshi LLC</p>
+            </div>
+        </div>`
 })
 export class ContractsSignatureComponent implements OnInit {
     signature_id: string | null = null;

front/app/src/common/crud/list/list.component.html

@@ -21,7 +21,6 @@
 					(filterChange)="onFilterChange($event)"
 			></crud-list-filter-list>
 		</div>
-		<span class="col col-form-label" i18n *ngIf="loading$ | async">Loading...</span>
 	</div>
 	<div class="table-responsive-md">
 		<table class="table table-striped table-hover">
@@ -31,6 +30,9 @@
 				</tr>
 			</thead>
 			<tbody>
+				<tr *ngIf="loading$ | async">
+					<td class="text-center" [attr.colspan]="this.displayedColumns.length" i18n>Loading...</td>
+				</tr>
 				<tr *ngFor="let row of listData$ | async" (click)="onRowClick(row._id)" (auxclick)="onRowMiddleClick(row._id);" class="table-row-link">
 					<td class="text-truncate" *ngFor="let col of this.displayedColumns"  style="max-width: 150px;">
 						<ngb-highlight [result]="getColumnValue(row, col.path)" [term]="searchTerm"></ngb-highlight>
@@ -40,7 +42,7 @@
 		</table>
 	</div>
 
-	<div class="d-flex justify-content-between p-2">
+	<div class="d-flex justify-content-between p-2" *ngIf="! (loading$ | async)" >
 		<ngb-pagination [collectionSize]="(total$ | async)!" [(page)]="page" [pageSize]="pageSize">
 		</ngb-pagination>
 

front/app/src/common/crud/list/list.component.ts

@@ -68,7 +68,6 @@ export class ListComponent implements OnInit {
             if (parsedParams.hasOwnProperty('searchFilters')) {
                 parsedParams['searchFilters'] = JSON.parse(parsedParams['searchFilters']);
             }
-            this._total$.next(this.page * this.pageSize);
             this._set(parsedParams)
         });
     }

front/app/src/common/crud/types/array.type.ts

@@ -2,36 +2,44 @@ import {Component, OnInit} from '@angular/core';
 import { FieldArrayType } from '@ngx-formly/core';
 
 @Component({
-  selector: 'formly-array-type',
-  template: `
-    <div>
-      <label *ngIf="props.label" class="form-label">{{ props.label }}</label>
-      <p *ngIf="props.description">{{ props.description }}</p>
-      <div class="alert alert-danger" role="alert" *ngIf="showError && formControl.errors">
-        <formly-validation-message [field]="field"></formly-validation-message>
-      </div>
-      <div class="row row-cols-1 row-cols-md-{{this.itemsPerRow}} g-1">
-          <div *ngFor="let entry of field.fieldGroup; let i = index" class="col">
-                <div class="card">
-                    <div class="card-header">
-                        <div *ngIf="props['numbered']" class="float-start">
-                            <strong>{{ i + 1 }}</strong>
+    selector: 'formly-array-type',
+    template: `
+        <div class="mb-3">
+            <ngb-accordion #acc="ngbAccordion" activeIds="ngb-panel-0">
+                <ngb-panel id="ngb-panel-0">
+                    <ng-template ngbPanelTitle>
+                        <label *ngIf="props.label" class="form-label">{{ props.label }}</label>
+                        <p *ngIf="props.description">{{ props.description }}</p>
+                        <div class="alert alert-danger" role="alert" *ngIf="showError && formControl.errors">
+                            <formly-validation-message [field]="field"></formly-validation-message>
                         </div>
-                        <div *ngIf="! this.field.props.readonly" class="btn-group float-end">
-                            <button class="btn btn-primary btn-sm" [attr.disabled]="i == 0 ? 'disabled' : null" type="button" (click)="move(i, i-1)"><i-bs name="caret-up-fill"></i-bs></button>
-                            <button class="btn btn-primary btn-sm" [attr.disabled]="i == this.field.fieldGroup!.length-1 ? 'disabled' : null" type="button" (click)="move(i, i+1)"><i-bs name="caret-down-fill"></i-bs></button>
-                            <button class="btn btn-danger btn-sm" [attr.disabled]="field.props!['removable'] === false ? 'disabled' : null" type="button" (click)="remove(i)"><i-bs name="x-octagon-fill"></i-bs></button>
+                    </ng-template>
+                    <ng-template ngbPanelContent>
+                        <div class="row row-cols-1 row-cols-md-{{this.itemsPerRow}} g-1">
+                            <div *ngFor="let entry of field.fieldGroup; let i = index" class="col">
+                                <div class="card">
+                                    <div class="card-header">
+                                        <div *ngIf="props['numbered']" class="float-start">
+                                            <strong>{{ i + 1 }}</strong>
+                                        </div>
+                                        <div *ngIf="! this.field.props.readonly" class="btn-group float-end">
+                                            <button class="btn btn-primary btn-sm" [attr.disabled]="i == 0 ? 'disabled' : null" type="button" (click)="move(i, i-1)"><i-bs name="caret-up-fill"></i-bs></button>
+                                            <button class="btn btn-primary btn-sm" [attr.disabled]="i == this.field.fieldGroup!.length-1 ? 'disabled' : null" type="button" (click)="move(i, i+1)"><i-bs name="caret-down-fill"></i-bs></button>
+                                            <button class="btn btn-danger btn-sm" [attr.disabled]="field.props!['removable'] === false ? 'disabled' : null" type="button" (click)="remove(i)"><i-bs name="x-octagon-fill"></i-bs></button>
+                                        </div>
+                                    </div>
+                                    <div class="card-body">
+                                        <formly-field class="col" [field]="entry"></formly-field>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                    <div class="card-body">
-                        <formly-field class="col" [field]="entry"></formly-field>
-                    </div>
-                </div>
-            </div>
+                        <button *ngIf="! this.field.props.readonly" class="btn btn-success col-sm-12 gap-3" type="button" (click)="add()"><i-bs name="plus-square-fill"></i-bs></button>
+                    </ng-template>
+                </ngb-panel>
+            </ngb-accordion>
         </div>
-        <button *ngIf="! this.field.props.readonly" class="btn btn-success col-sm-12" type="button" (click)="add()"><i-bs name="plus-square-fill"></i-bs></button>
-    </div>
-  `,
+    `,
 })
 export class ArrayTypeComponent extends FieldArrayType implements OnInit {
     colSm: string = "col-sm-6"

front/app/src/common/crud/types/dictionary.type.ts

@@ -10,7 +10,7 @@ import {FormlyJsonschema} from "@ngx-formly/core/json-schema";
     template: `
         <div class="mb-3">
             <ngb-accordion #acc="ngbAccordion" activeIds="ngb-panel-0">
-                <ngb-panel>
+                <ngb-panel id="ngb-panel-0">
                     <ng-template ngbPanelTitle>
                         <label *ngIf="props.label && props['hideLabel'] !== true" [attr.for]="id"
                                class="form-label">{{ props.label }}

front/app/src/index.html

@@ -2,10 +2,13 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>App</title>
+  <title>Cooper, Hillman & Toshi</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <meta property="og:title" content="Cooper, Hillman & Toshi">
+  <meta property="og:description" content="Interface d'administration des contrats">
+  <meta property="og:image" content="/assets/logo.png">
 </head>
 <body>
   <app-root></app-root>

front/app/src/styles.css

@@ -36,4 +36,5 @@
 
 .nav-link.active {
     border: #D2BA6F solid 2px;
+    border-radius: 0;
 }