Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ <h4>{{'masterData.doc-category-mapping'|translate}}<span></span></h4>
</div>
</mat-card-content>
<mat-card-actions class="action-buttons">
<button (click)="changePage('home')" type="button" mat-raised-button>Cancel</button>
<button (click)="changePage('home')" type="button" mat-raised-button> {{ "center.cancel" | translate }}</button>
</mat-card-actions>
</mat-card>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ export class MaterDataCommonBodyComponent implements OnInit {
this.dataStorageService.updateData(request).subscribe(updateResponse => {
if (!updateResponse.errors) {
if(textToValidate){
this.secondaryData["code"] = updateResponse.response.code;
// this.secondaryData["code"] = updateResponse.response.code;
if(updateResponse.response.id && url !== "dynamicfields"){
this.secondaryData["id"] = updateResponse.response.id;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
</div>
</div>
<div class="item2">
<div *ngIf="router.indexOf('create') === -1">
<h3>{{'center.center-name'|translate}}:&nbsp;<span>{{headerData.name}}</span></h3>
<p>{{'center.center-id'|translate}}:&nbsp; <span>{{headerData.id}}</span></p>
<p class="small-text">{{'center.status'|translate}}:&nbsp; <span>{{headerData.isActive | status}}</span></p>
</div>
</div>
<mat-divider [vertical]="true" [inset]="true"></mat-divider>
<div class="item3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { CenterModel } from 'src/app/core/models/center.model';
import { HeaderService } from 'src/app/core/services/header.service';

import * as appConstants from '../../../../app.constants';
import { Router } from '@angular/router';

@Component({
selector: 'app-center-header',
Expand All @@ -22,7 +23,7 @@ import * as appConstants from '../../../../app.constants';
})
export class CenterHeaderComponent implements OnInit, OnChanges {
actionButtonElipses = new Array();

router;
lang: string;

@Input() headerData: HeaderModel;
Expand All @@ -32,9 +33,12 @@ export class CenterHeaderComponent implements OnInit, OnChanges {
private dataSerice: DataStorageService,
private appService: AppConfigService,
private headerService: HeaderService,
private commonService: CommonService
private commonService: CommonService,
private _router: Router

) {
this.lang = headerService.getUserPreferredLanguage();
this.router = _router.url;
}

ngOnInit() {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ <h3>{{ "center.operational-details" | translate }}</h3>
<div
style="height: 30px;width: 100px;border: 1px solid #FF4081;border-radius: 30px;padding: 7px;margin: 15px;cursor: pointer;font-size: 11px;"
*ngIf="primary.exceptionalHolidays.value.length>=0 && data.exceptionHolidayDate!==null">
<span>{{ data.exceptionHolidayDate }}</span>
<span style="margin-right: 25px;">{{ data.exceptionHolidayDate }}</span>
<div style="position: absolute;
margin-left: 65px;
margin-top: -18px;
Expand Down
24 changes: 11 additions & 13 deletions admin-ui/src/app/features/resources/center/edit/edit.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<div id="flex-single-view" style="padding-top: 12px;">
<mat-spinner class="spinner-placer" *ngIf="showSpinner"></mat-spinner>
<div id="flex-single-view" style="padding-top: 12px;" *ngIf="!showSpinner">
<!-- <div class="navigation">
<span><i class="material-icons" (click) = "naviagteBack()" >keyboard_arrow_left</i></span>&nbsp;<span class="title">{{'center.center-detail-view'|translate}}</span>
</div> -->
Expand All @@ -13,8 +14,7 @@
<div style="padding-bottom: 50px;"></div>
<span><strong>{{ "center.language" | translate }}</strong></span>
<span *ngIf="!disablePrimaryForm" matTooltip="{{ 'center.keyboard-tooltip' | translate }}"
(click)="openKeyboard('primary')"
style="color: grey; cursor: pointer;"
(click)="openKeyboard('primary')" style="color: grey; cursor: pointer;"
[ngStyle]="isPrimaryLangRTL ? {'float':'left'} : {'float':'right'}">
<i class="material-icons">keyboard</i></span>
<hr />
Expand Down Expand Up @@ -109,7 +109,7 @@ <h3>{{ "center.location-details" | translate }}</h3>
<button id="createButton" mat-raised-button *ngIf="data.length == 0" (click)="submitPrimaryPanel()">
{{ "center.create" | translate }}
</button>
<button mat-raised-button (click)="cancel()">
<button mat-raised-button (click)="cancel()" *ngIf="secondaryLang">
{{ "center.cancel" | translate }}
</button>
</mat-card-actions>
Expand All @@ -129,8 +129,7 @@ <h3>{{ "center.location-details" | translate }}</h3>

<span><strong>{{ secondaryLanguageLabels["language"] }}</strong></span>
<span *ngIf="!disableSecondaryForm" matTooltip="{{ secondaryLanguageLabels['keyboard-tooltip'] }}"
(click)="openKeyboard('secondary')"
style="color: grey; cursor: pointer;"
(click)="openKeyboard('secondary')" style="color: grey; cursor: pointer;"
[ngStyle]="isSecondaryLangRTL ? {'float':'left'} : {'float':'right'}">
<i class="material-icons">keyboard</i></span>
<hr />
Expand Down Expand Up @@ -256,12 +255,10 @@ <h3>{{ secondaryLanguageLabels["location-details"] }}</h3>
</mat-form-field>
</div>
<mat-card-actions class="action-buttons">
<button id="createButton" mat-raised-button *ngIf="data.length > 1 && data[1] != null"
(click)="submitSecondaryPanel()">
<button id="createButton" mat-raised-button *ngIf="showUpdateButton" (click)="submitSecondaryPanel()">
{{ "center.update" | translate }}
</button>
<button id="createButton" mat-raised-button *ngIf="data.length > 1 && data[1] == null"
(click)="submitSecondaryPanel()">
<button id="createButton" mat-raised-button *ngIf="!showUpdateButton" (click)="submitSecondaryPanel()">
{{ "center.create" | translate }}
</button>
<button mat-raised-button (click)="cancel()">
Expand Down Expand Up @@ -388,7 +385,8 @@ <h3>{{ "center.location-details" | translate }}</h3>
</mat-form-field>
</div>
<div>
<mat-form-field *ngFor="let fieldName of locationFieldNameList; let i = index; let odd = odd" [ngClass]="odd ? 'right-sizing-container' : 'left-sizing-container'">
<mat-form-field *ngFor="let fieldName of locationFieldNameList; let i = index; let odd = odd"
[ngClass]="odd ? 'right-sizing-container' : 'left-sizing-container'">
<mat-label>{{ fieldName }}</mat-label>
<mat-select [value]="dynamicFieldValue[fieldName]" id="{{fieldName}}" (selectionChange)="
loadLocationDataDynamically($event, i);">
Expand Down Expand Up @@ -641,7 +639,7 @@ <h3>{{ "center.operational-details" | translate }}</h3>
</div>
<br />
<mat-label>{{ "center.workingDays" | translate }} </mat-label>
<mat-selection-list formControlName="workingDays">
<mat-selection-list formControlName="workingDays">
<div style="display: flex; flex-wrap: wrap; margin-left: -15px;">
<mat-list-option style="background-color: white" [checkboxPosition]="before" *ngFor="let day of days"
[value]="day.code">
Expand Down Expand Up @@ -673,7 +671,7 @@ <h3>{{ "center.operational-details" | translate }}</h3>
<div
style="height: 30px;width: 100px;border: 1px solid #FF4081;border-radius: 30px;padding: 7px;margin: 15px;cursor: pointer;font-size: 11px;"
*ngIf="common.exceptionalHolidays.value.length>=0 && data.exceptionHolidayDate!==null">
<span>{{ data.exceptionHolidayDate }}</span>
<span style="margin-right: 25px;">{{ data.exceptionHolidayDate }}</span>
<div style="position: absolute;
margin-left: 65px;
margin-top: -18px;
Expand Down
Loading