Merge branch 'main' into prod

smartcommunitylab · Feb 13, 2024 · a38a323 · a38a323
2 parents 7cae530 + 8b91cda
commit a38a323
Show file tree

Hide file tree

Showing 12 changed files with 1,100 additions and 223 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,3 @@
 # dslab.playgo-backoffice
+./generate-api.sh
+ // to generate the api
diff --git a/src/app/core/api/generated/controllers/consoleController.service.ts b/src/app/core/api/generated/controllers/consoleController.service.ts
@@ -295,43 +295,42 @@ export class ConsoleControllerService {
    * @param toCheck toCheck
    */
   public searchTrackedInstanceUsingGET(args: {
-    page: number;
-    size: number;
     territoryId: string;
-    sort?: string;
     trackId?: string;
     playerId?: string;
     modeType?: string;
     dateFrom?: number;
     dateTo?: number;
     campaignId?: string;
     status?: string;
-    toCheck?: boolean;
     scoreStatus?: string;
+    toCheck?: boolean;
+    multimodalId?: string;
+    page?: number;
+    size?: number;
+    sort?: string;
   }): Observable<PageTrackedInstanceConsole> {
     const {
-      page,
-      size,
       territoryId,
-      sort,
       trackId,
       playerId,
       modeType,
       dateFrom,
       dateTo,
       campaignId,
       status,
-      toCheck,
       scoreStatus,
+      toCheck,
+      multimodalId,
+      page,
+      size,
+      sort,
     } = args;
     return this.http.request<PageTrackedInstanceConsole>(
       "get",
       environment.serverUrl.api + `/playandgo/api/console/track/search`,
       {
         params: removeNullOrUndefined({
-          page,
-          size,
-          sort,
           territoryId,
           trackId,
           playerId,
@@ -340,8 +339,12 @@ export class ConsoleControllerService {
           dateTo,
           campaignId,
           status,
+          scoreStatus,
           toCheck,
-          scoreStatus
+          multimodalId,
+          page,
+          size,
+          sort,
         }),
       }
     );

diff --git a/src/app/core/api/generated/model/pageTrackedInstanceConsole.ts b/src/app/core/api/generated/model/pageTrackedInstanceConsole.ts
@@ -21,6 +21,7 @@ export interface PageTrackedInstanceConsole {
   number?: number;
   numberOfElements?: number;
   pageable?: SwaggerPageable;
+  multimodalId?: string;
   size?: number;
   sort?: Sort;
   totalElements?: number;

diff --git a/src/app/pages/campaign/campaign-add-form/campaign-add-form.component.html b/src/app/pages/campaign/campaign-add-form/campaign-add-form.component.html
diff --git a/src/app/pages/campaign/campaign-add-form/campaign-add-form.component.ts b/src/app/pages/campaign/campaign-add-form/campaign-add-form.component.ts
diff --git a/src/app/pages/campaign/campaign-page/campaign-page.component.html b/src/app/pages/campaign/campaign-page/campaign-page.component.html
@@ -198,7 +198,7 @@
                 </mat-grid-list>
                 <!-- old <img class="img-logo" src="{{PREFIX_SRC_IMG_C + selectedCampaign.banner.contentType + BASE64_SRC_IMG_C + selectedCampaign.banner.image}}"> -->
                 <mat-card-content>
-                    <div style="margin-top: 10px">
+                    <!-- <div style="margin-top: 10px">
                         <mat-grid-list cols="4" rowHeight="30px" style="margin-bottom:10px;">
                             <mat-grid-tile><h3>{{'means' | translate}}</h3></mat-grid-tile>
                             <mat-grid-tile><h3>{{'dailyLimitString' | translate}}</h3></mat-grid-tile>
@@ -221,7 +221,7 @@
                         <drop-down-card-info [title]="'managers' | translate"
                         [content]="managers">
                     </drop-down-card-info>
-                    </div>
+                    </div> -->
                 </mat-card-content>
                 <img *ngIf="selectedCampaign.banner" class="img-banner" src="{{ selectedCampaign.banner.url }}">
 

diff --git a/src/app/pages/track/validation-track/validation-track.component.html b/src/app/pages/track/validation-track/validation-track.component.html
@@ -41,6 +41,18 @@
                             </mat-select>
                         </mat-form-field>
                     </mat-grid-tile>
+                    <div *ngIf="validatingForm.get('playerId').value">
+                        <mat-grid-tile></mat-grid-tile>
+                        <mat-grid-tile></mat-grid-tile>
+                        <mat-grid-tile>
+                            <mat-form-field appearance="fill" class="full-width margin-form">
+                                <mat-label>{{'modalTrackId' | translate}}</mat-label>
+                                <input matInput id="modalTrackId" formControlName="modalTrackId"
+                                (ngModelChange)="resetPageNumber()">
+                            </mat-form-field>
+                        </mat-grid-tile>
+                        <mat-grid-tile></mat-grid-tile>
+                    </div>
                     <mat-grid-tile>
                         <mat-form-field appearance="fill" class="full-width margin-form">
                             <mat-label>{{'dateTo' | translate}}</mat-label>
@@ -314,6 +326,17 @@
                                             </span>
                                         </span>
                                     </mat-grid-tile>
+                                    <mat-grid-tile [colspan]="10">
+                                        <span class=" left-text full-width">
+                                            <span class="bold">
+                                                {{'modalTrackId' | translate}}:
+                                            </span>
+                                            <a (click)="serachByMultimodal(element)" class="text-center full-width decoration-underline">
+                                                {{element.trackedInstance.multimodalId}}
+                                            </a>
+                                        </span>
+                                    </mat-grid-tile>
+                                    <!-- multimodalId -->
                                     <!-- <mat-grid-tile [colspan]="1">
                                         <mat-checkbox [checked]="!valueOfCheck(element.trackedInstance.toCheck)"
                                             (change)="changeToCheck($event.checked,element)" [color]="'primary'">
@@ -410,6 +433,16 @@
                                             </span>
                                         </div>
                                     </mat-grid-tile>
+                                    <mat-grid-tile [colspan]="3">
+                                        <div class="wrapper">
+                                            <span class="info-title">
+                                                <span class="bold">{{'modalTrackId' | translate}}:</span> <br />
+                                                <a (click)="serachByMultimodal(selectedTrack)" class="decoration-underline">
+                                                    {{selectedTrack.trackedInstance.multimodalId}}
+                                                </a>
+                                            </span>
+                                        </div>
+                                    </mat-grid-tile>
                                     <div *ngIf="!!selectedTrack.trackedInstance.deviceInfo">
                                         <mat-grid-tile [colspan]="2">
                                             <div class="wrapper">
@@ -600,6 +633,12 @@ <h3 style="margin-bottom: 0px;">
                                                             translate}}:
                                                             {{campaign.score}},
                                                         </span>
+                                                        <span
+                                                            *ngIf="campaign.type==='company'">
+                                                            {{'virtualScore' |
+                                                            translate}}:
+                                                            {{campaign.virtualScore | number:'1.0-2'}},
+                                                        </span>
                                                         {{'distance' | translate}}: {{campaign.distance |
                                                         round}} (m)
                                                     </p>

diff --git a/src/app/pages/track/validation-track/validation-track.component.scss b/src/app/pages/track/validation-track/validation-track.component.scss
@@ -153,7 +153,7 @@
 
 .header-detatils{
   width: 99%;
-  height: 560px;
+  height: 620px;
   margin-left: 1%;
 }
 
@@ -273,4 +273,9 @@
 
 .margin-bottom-sm{
   margin-bottom: 5px;
+}
+
+.decoration-underline{
+  text-decoration: underline;
+  text-decoration-color: #01579b;
 }