some fixes

apps/maarch_entreprise/Views/about-us.component.html

 <div class="admin-container" [class.admin-is-mobile]="mobileQuery.matches">
-    <mat-sidenav-container autosize class="admin-sidenav-container" [style.marginTop.px]="mobileMode ? 56 : 0">
+    <mat-sidenav-container autosize class="admin-sidenav-container" >
         <mat-sidenav #snav [mode]="mobileMode ? 'over' : 'side'" [fixedInViewport]="mobileMode" fixedTopGap="56" [opened]="mobileMode ? false : true"
             autoFocus="false">
             <menu-shortcut></menu-shortcut>

apps/maarch_entreprise/Views/basket-home.component.html

@@ -49,7 +49,7 @@
             <a mat-list-item *ngFor="let basket of homeData.assignedBaskets | filterList:listFilter.value">
                 <mat-icon *ngIf="!mobileMode" style="color:#666" mat-list-icon class="fa fa-inbox"></mat-icon>
                 <span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
-                <span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge">{{basket.resourceNumber}}</span>
+                <span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
                 <p mat-line (click)="goToRedirect(basket.basket_id,basket.basket_owner)" title="{{basket.basket_name}}" style="color:#666">
                     {{basket.basket_name}}<br/><small color="primary">({{basket.userToDisplay}})</small>
                 </p>

apps/maarch_entreprise/Views/home.component.html

@@ -75,10 +75,11 @@
                         <td mat-cell *matCellDef="let row" style="width:25%;overflow:hidden;text-overflow: ellipsis;white-space: nowrap;padding: 5px;vertical-align: middle;">
                             <div style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;">
                                 <b>De:</b>&nbsp;
-                                <span *ngIf="row.user_firstname">{{row.user_firstname}}</span>&nbsp;
+                                <span *ngIf="row.user_firstname">{{row.user_firstname}}&nbsp;</span>
                                 <span *ngIf="row.user_lastname">{{row.user_lastname}}</span>
                                 <span *ngIf="row.contact_lastname==''">{{row.contact_society}}</span>
-                                <span *ngIf="row.contact_society==''">{{row.contact_lastname}}</span> &nbsp;
+                                <span *ngIf="row.contact_society==''">{{row.contact_firstname}}&nbsp;</span> 
+                                <span *ngIf="row.contact_society==''">{{row.contact_lastname}}</span>
                             </div>
                             <div style="color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;">
                                 <b>Pour:</b>&nbsp;

apps/maarch_entreprise/Views/search-home.component.html

@@ -3,7 +3,13 @@
     <input type="hidden" name="meta[]" value="baskets_clause#baskets_clause#select_simple">
     <input type="hidden" name="meta[]" value="welcome#welcome#welcome">
     <input type="hidden" name="baskets_clause" value="true">
-    <input id="text" type="text" name="welcome" placeholder="{{lang.searchMails}}" class="searchInput" style="width:100%">
-    <!-- <span matSuffix><mat-icon class="fa fa-search"></mat-icon></span> -->
-    <input type="submit" name="submit" value="" style="display:none">
+    <mat-form-field id="searchInput" floatLabel="never" style="width:100%">
+        <input matInput type="text" name="welcome" placeholder="{{lang.searchMails}}" style="width:100%">
+        <button mat-button matSuffix mat-icon-button aria-label="Clear" (click)="searchHome.submit();" style="opacity:0.5;">
+          <mat-icon class="fa fa-search"></mat-icon>
+        </button>
+    </mat-form-field>
+      
+    <!--<input id="text" type="text" name="welcome" placeholder="{{lang.searchMails}}" class="searchInput" style="width:100%">-->
+    <input #searchHome type="submit" name="submit" value="" style="display:none">
 </form>

apps/maarch_entreprise/css/engine.css

@@ -364,4 +364,12 @@ h1.admin-app-name {
     display: flex;
     align-items: center;
     justify-content: center;
+}
+
+#searchInput .mat-form-field-infix{
+    width: 100%;
+}
+
+#searchInput .mat-form-field-label {
+    opacity: 0.5;
 }
\ No newline at end of file

apps/maarch_entreprise/css/maarch-material.scss

@@ -125,15 +125,4 @@ $theme: mat-light-theme($primary, $accent, $warn);
   opacity : 1 !important;
   border: dashed 5px mat-color($primary, 500) !important;
   color : mat-color($primary, 500);
-}
-
-.searchInput {
-  color: #333;
-  border: none;
-  border-radius: 100px;
-  background-color: #fafafa;
-  padding: 5px 16px;
-  width: 400px;
-  max-width: 400px;
-  height: 36px;
-}
+}
\ No newline at end of file

src/app/home/controllers/HomeController.php

@@ -90,6 +90,7 @@ class HomeController
                 'r.case_label',
                 'r.closing_date',
                 'r.category_id',
+                'r.contact_firstname',
                 'r.contact_lastname',
                 'r.contact_society',
                 'r.creation_date',