Commit a253c195 by DESKTOP-E3GSHH7\myhr

เเก้ไขตอนกดเซฟ

parent 5927934c
<app-page-header [title]="'จัดการประเภทงาน'" [activeTitle]="'ผู้ดูแลระบบ'" [title1]="'จัดการประเภทงาน'"></app-page-header>
<app-page-header [title]="'จัดการประเภทงาน'" [activeTitle]="'ผู้ดูแลระบบ'"
[title1]="'จัดการประเภทงาน'"></app-page-header>
<div class="grid grid-cols-12 gap-6">
<div class="xl:col-span-12 col-span-12">
......@@ -172,10 +173,10 @@
</div>
</div>
<div class="xl:col-span-12 col-span-12">
<label for="thName" class="form-label">{{'Description(ENG)' | translate}}</label>
<input type="text" class="form-control" id="thName" placeholder="" [(ngModel)]="selectModel.engName"
<label for="engName" class="form-label">{{'Description(ENG)' | translate}}</label>
<input type="text" class="form-control" id="engName" placeholder="" [(ngModel)]="selectModel.engName"
[disabled]="action === 'edit'">
<div class="text-danger" *ngIf="!selectModel.thName">
<div class="text-danger" *ngIf="!selectModel.engName">
{{'Please fill in information' | translate}}
</div>
</div>
......@@ -187,9 +188,11 @@
data-hs-overlay="#modal-detail">
{{'Cancel' | translate}}
</button>
<button type="button" (click)="save()" class="ti-btn bg-primary text-white !font-medium">{{'Save' |
<button type="button" (click)="save()" class="ti-btn bg-primary text-white !font-medium"
[class.ti-btn-disabled]="!selectModel.jobTypeId||!selectModel.thName||!selectModel.engName"
[disabled]="!selectModel.jobTypeId||!selectModel.thName||!selectModel.engName">{{'Save' |
translate}}</button>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
......@@ -32,7 +32,7 @@
<input class="form-check-input check-all" type="checkbox" id="all-products"
(change)="toggleAll($event)" [checked]="allSelected" aria-label="...">
</th>
<th scope="col" class="text-start">รหัสประเภทงาน</th>
<th scope="col" class="text-start">รหัสจังหวัด</th>
<th scope="col" class="text-start">ชื่อย่อ (ไทย)</th>
<th scope="col" class="text-start">ชื่อย่อ (อังกฤษ)</th>
<th scope="col" class="text-start">รายละเอียด (ไทย)</th>
......@@ -167,7 +167,7 @@
<div class="grid grid-cols-12 gap-4">
<div class="xl:col-span-12 col-span-12">
<label for="provinceId" class="form-label">{{'provinceId' | translate}}</label>
<label for="provinceId" class="form-label">{{'รหัสจังหวัด' | translate}}</label>
<input type="text" class="form-control" id="provinceId" placeholder="" [(ngModel)]="selectModel.provinceId"
[readonly]="action === 'edit'" [readonly]="action === 'edit'"
[ngClass]="{ '!bg-input-readonly': action === 'edit' }">
......@@ -256,7 +256,9 @@
data-hs-overlay="#modal-detail">
{{'Cancel' | translate}}
</button>
<button type="button" (click)="save()" class="ti-btn bg-primary text-white !font-medium">{{'Save' |
<button type="button" (click)="save()" class="ti-btn bg-primary text-white !font-medium"
[class.ti-btn-disabled]="!selectModel.provinceId||!selectModel.thName||!selectModel.engName||!selectedCountry||!selectedRegion"
[disabled]="!selectModel.provinceId||!selectModel.thName||!selectModel.engName||!selectedCountry||!selectedRegion">{{'Save' |
translate}}</button>
</div>
</div>
......
......@@ -49,9 +49,9 @@ export class ProvinceComponent {
countryList: CountryModel[] = [];
selectedCountry: CountryModel | undefined
regionList : RegionModel[] = []
regionList: RegionModel[] = []
selectedRegion: RegionModel | undefined
pageIndex = 0;
get searchTerm(): string {
......@@ -70,9 +70,9 @@ export class ProvinceComponent {
_searchTerm = "";
constructor(private provinceservice: ProvinceService,
public translate: TranslateService,
private tokenService: TokenService,
constructor(private provinceservice: ProvinceService,
public translate: TranslateService,
private tokenService: TokenService,
private router: Router,
private countryservice: CountryService,
private regionService: RegionService,
......@@ -139,7 +139,7 @@ export class ProvinceComponent {
x.shortTname?.toLowerCase().indexOf(v.toLowerCase()) !== -1 ||
x.shortEname?.toLowerCase().indexOf(v.toLowerCase()) !== -1 ||
x.thName?.toLowerCase().indexOf(v.toLowerCase()) !== -1 ||
x.engName?.toLowerCase().indexOf(v.toLowerCase()) !== -1
x.engName?.toLowerCase().indexOf(v.toLowerCase()) !== -1
);
}
......@@ -184,7 +184,7 @@ export class ProvinceComponent {
c => c.countryId === this.selectModel.country?.countryId
);
}
if (this.selectModel.region && this.regionList){
if (this.selectModel.region && this.regionList) {
this.selectedRegion = this.regionList.find(
r => r.regionId === this.selectModel.region?.regionId
)
......@@ -197,7 +197,7 @@ export class ProvinceComponent {
compareCountries(country1: CountryModel, country2: CountryModel): boolean {
return country1 && country2 ? country1.countryId === country2.countryId : country1 === country2;
}
onRegionChange(selectedRegion: RegionModel): void {
this.selectedRegion = selectedRegion;
this.selectModel.region = selectedRegion;
......@@ -205,35 +205,9 @@ export class ProvinceComponent {
compareRegion(region1: RegionModel, region2: RegionModel): boolean {
return region1 && region2 ? region1.regionId === region2.regionId : region1 === region2;
}
save() {
const checkprovince = this.selectModel;
if (!checkprovince.provinceId) {
swal({
title: "ข้อผิดพลาด!",
text: "กรุณาระบุรหัสจังหวัด",
icon: "warning",
buttons: ["ยกเลิก", "ยืนยัน"],
});
return;
} else if(!checkprovince.country){
swal({
title: "ข้อผิดพลาด!",
text: "กรุณาเลือกประเทศ",
icon: "warning",
buttons: ["ยกเลิก", "ยืนยัน"],
});
return;
} else if(!checkprovince.region){
swal({
title: "ข้อผิดพลาด!",
text: "กรุณาเลือกภูมิภาค",
icon: "warning",
buttons: ["ยกเลิก", "ยืนยัน"],
});
return;
}
console.log('Before Save, selectModel is:', this.selectModel);
swal({
title: "คุณแน่ใจหรือไม่?",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment