Commit 87ce7637 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch... 

Merge branch '24-a-non-admin-user-must-not-be-able-to-change-a-service-order-service-state' into 'develop'

Resolve "A non-admin user must not be able to change a Service Order & Service state"

See merge request !16
parents 3e734756 3b104cb0

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

+6 −6
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">

src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html

+6 −6
Original line number Diff line number Diff line
@@ -61,13 +61,13 @@ 
                                                  </div>



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

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

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

                                                          <h6>State</h6>

                                                          <p [ngClass]="serviceStateClassSelector(service?.state)">

                                                              <b>{{service?.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">

                                                              <mat-option *ngFor="let state of availableStates"
@@ -116,7 +116,7 @@ 
                                              <div class="row">



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

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

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

                                                          <h6>Starting Date</h6>

                                                          <p [class.mb-0]="service?.startDate"

                                                              *ngIf="service?.startDate">
@@ -127,7 +127,7 @@ 
                                                              UTC</p>

                                                      </ng-container>



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

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

                                                          [owlDateTimeTrigger]="pickerFrom" class="mb-2">

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

                                                          <input matInput [owlDateTime]="pickerFrom"
@@ -142,7 +142,7 @@ 
                                                  </div>



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

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

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

                                                          <h6>Ending Date</h6>

                                                          <p [class.mb-0]="service?.endDate" *ngIf="service?.endDate">

                                                              {{service?.endDate | date:'d MMM y, h:mm a'}} - Local
@@ -152,7 +152,7 @@ 
                                                              UTC</p>

                                                      </ng-container>



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

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

                                                          [owlDateTimeTrigger]="pickerFrom" class="mb-2">

                                                          <mat-label>Ending Date</mat-label>

                                                          <input matInput [owlDateTime]="pickerFrom"

src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.ts

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ export class PreviewServiceComponent implements OnInit { 
    endDate: new FormControl()

  })

  editMode: boolean = false

  isAdminUser: boolean = false



  newNote: boolean = false

  availableStates = ['feasibilityChecked', 'designed', 'reserved', 'inactive', 'active', 'terminated']
@@ -64,6 +65,7 @@ export class PreviewServiceComponent implements OnInit { 
  jsonEditorOptions = new JsonEditorOptions()



  ngOnInit() {

    this.isAdminUser = this.authService.portalUserJWT.realm_access.roles.includes('ADMIN')



    this.initSubscriptions()