MR for Release 2024Q4

Kostis Trantzasrequested to merge
develop into main

Merge request reports

src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html

+1 −1
Changes for src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ 
                                    {{ note.text }}

                                    <div class="small">

                                      written by {{ note.author }} @

                                      {{ note.date | date: "d MMM y, h:mm a" }}

                                      {{ note.date | date: "d MMM y, h:mm:ss a" }}

                                    </div>

                                  </div>

                                </div>

src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.scss

+5 −0
Changes for src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.scss: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -14,3 +14,8 @@ 
.tab-pane > .card:nth-child(1) {

    min-height: max(350px, 20vh);

}



.notes-container {

    max-height: 265px;

    overflow-y: auto;

}
 
 No newline at end of file

src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts

+1 −1
Changes for src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ export class ResourceReservationCalendarComponent implements OnInit { 
            this.reservations

            ).map(function(eventEl: Reservation) {

              

              console.info("this is event: " + eventEl.id +" " + eventEl.requestedPeriodStartDateTime  )

              // console.info("this is event: " + eventEl.id +" " + eventEl.requestedPeriodStartDateTime  )

              // var result = new Date(eventEl.startDate);

              // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today

src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts

+1 −1
Changes for src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ export class ListServiceOrdersComponent implements OnInit { 
            this.serviceOrders

            ).map(function(eventEl: ServiceOrder) {

              

              console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate )

              // console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate )

              // var result = new Date(eventEl.startDate);

              // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today

src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html

+6 −6
Changes for src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -155,12 +155,12 @@ 
                                                        </mat-form-field> -->

                                                    </div>

                                                    <div class="col-lg-6">

                                                        <ng-container *ngIf="!editMode">

                                                        <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">

                                                            <h6>State</h6>

                                                            <p [ngClass]="orderStateClassSelector(serviceOrder?.state)"><b>{{serviceOrder?.state}}</b></p>

                                                        </ng-container>

                

                                                        <mat-form-field *ngIf="editMode">

                                                        <mat-form-field *ngIf="editMode && isAdminUser">

                                                            <mat-label>State</mat-label>

                                                            <mat-select formControlName="state">

                                                                <ng-container *ngIf="serviceOrder?.state === 'INITIAL'">
@@ -181,7 +181,7 @@ 
                                                    </div>

                

                                                    <div class="col-lg-6">

                                                        <ng-container *ngIf="!editMode">

                                                        <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">

                                                            <h6>Starting Date</h6>

                                                            <div *ngIf="serviceOrder?.startDate">

                                                                <p class="mb-0">{{serviceOrder?.startDate | date:'d MMM y, h:mm a'}} - Local Time</p>
@@ -189,7 +189,7 @@ 
                                                            </div>

                                                        </ng-container>

                

                                                        <mat-form-field *ngIf="editMode" [owlDateTimeTrigger]="pickerFrom" class="mb-2">

                                                        <mat-form-field *ngIf="editMode && isAdminUser" [owlDateTimeTrigger]="pickerFrom" class="mb-2">

                                                            <mat-label>Starting Date</mat-label>

                                                            <input matInput [owlDateTime]="pickerFrom" placeholder="Date Time"

                                                                formControlName="startDate">
@@ -200,7 +200,7 @@ 
                                                    </div>

                

                                                    <div class="col-lg-6">

                                                        <ng-container *ngIf="!editMode">

                                                        <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">

                                                            <h6>Expected Completion Date</h6>

                                                            <div *ngIf="serviceOrder?.expectedCompletionDate">

                                                                <p class="mb-0">{{serviceOrder?.expectedCompletionDate | date:'d MMM y, h:mm a'}} - Local Time</p>
@@ -209,7 +209,7 @@ 


                                                        </ng-container>

                

                                                        <mat-form-field *ngIf="editMode" [owlDateTimeTrigger]="pickerUntil" class="mb-2">

                                                        <mat-form-field *ngIf="editMode && isAdminUser" [owlDateTimeTrigger]="pickerUntil" class="mb-2">

                                                            <mat-label>Expected Completion Date </mat-label>

                                                            <input matInput [owlDateTime]="pickerUntil" placeholder="Date Time"

                                                                formControlName="expectedCompletionDate">