Correcting list navigation

Changing the contract file name to the contract label. Updating label content with a dash
Updating favicon
2023-03-26 21:00:38 +02:00 · 2023-03-24 13:42:07 +01:00 · 2023-03-21 21:33:22 +01:00 · 2023-03-20 16:02:27 +01:00 · 2023-03-20 16:00:46 +01:00
7 changed files with 11 additions and 6 deletions
--- a/back/app/contract/models.py
+++ b/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
--- a/back/app/contract/print/init.py
+++ b/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):
--- a/front/app/src/common/crud/list/list.component.html
+++ b/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>

--- a/front/app/src/common/crud/list/list.component.ts
+++ b/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)
        });
    }
--- a/front/app/src/favicon.ico
+++ b/front/app/src/favicon.ico
--- a/front/app/src/index.html
+++ b/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>
--- a/front/app/src/styles.css
+++ b/front/app/src/styles.css
@@ -36,4 +36,5 @@

 .nav-link.active {
    border: #D2BA6F solid 2px;
+    border-radius: 0;
 }
Author	SHA1	Message	Date
ewandor	8d4d64076a	Correcting list navigation	2023-03-26 21:00:38 +02:00
ewandor	f9867b3e2b	Changing the contract file name to the contract label. Updating label content with a dash	2023-03-24 13:42:07 +01:00
ewandor	b89d043880	Updating favicon	2023-03-21 21:33:22 +01:00
ewandor	0ecbb99423	Square border radii	2023-03-20 16:02:27 +01:00
ewandor	61bd5589ff	Adding static meta to index.html	2023-03-20 16:00:46 +01:00