From f25fa6acf43c87a8de2955a709c3b7ec2ea56322 Mon Sep 17 00:00:00 2001 From: chanachai otepim <chanachai.o@myhr.co.th> Date: Mon, 20 Dec 2021 10:43:18 +0700 Subject: [PATCH] Update กดบันทึกแล้วข้อมูลขึ้น --- src/app/models/contact.model.ts | 11 +++++++++++ src/app/pages/contact-admin/contact-admin.component.html | 64 ++++++++++++++++++++++++++++++++++++---------------------------- src/app/service/contact.service.ts | 12 +++++++++++- src/app/service/room.service.ts | 2 +- 4 files changed, 59 insertions(+), 30 deletions(-) diff --git a/src/app/models/contact.model.ts b/src/app/models/contact.model.ts index 7c76f6c..83b280f 100644 --- a/src/app/models/contact.model.ts +++ b/src/app/models/contact.model.ts @@ -16,4 +16,15 @@ export class Contact { this.ctStatus = 0; this.sDate = ''; } +} + +export interface SearchContactModel { + sDate: string; +} + +export class SearchContactModel { + constructor(init?: SearchContactModel) { + Object.assign(this, init); + this.sDate = '' + } } \ No newline at end of file diff --git a/src/app/pages/contact-admin/contact-admin.component.html b/src/app/pages/contact-admin/contact-admin.component.html index 18071bc..0332407 100644 --- a/src/app/pages/contact-admin/contact-admin.component.html +++ b/src/app/pages/contact-admin/contact-admin.component.html @@ -2,20 +2,26 @@ <div class="card"> <div class="card-body"> <div class="row"> - <div class="col-4 md-1"> + <div class="col-6 md-1"> <label>ชื่อผู้แจ้ง Bug:</label> - <input input class=" form-control" placeholder="" type="text" /> + <input input class=" form-control" placeholder="" type="text" [(ngModel)]="modelContact.ctName"/> </div> - <div class="col-4 md-1"> + <div class="col-6 md-1"> <label for="typeahead-focus">หัวข้อการแจ้ง Bug:</label> - <input input class=" form-control" placeholder="" type="text" /> + <input input class=" form-control" placeholder="" type="text" [(ngModel)]="modelContact.ctHead"/> </div> - <div class="col-4 md-1"> + </div> + <div class="row"> + <div class="col-6 md-1"> <label for="typeahead-focus">หน้าต่างที่ต้องการแจ้ง Bug:</label> - <input id="typeahead-focus" type="text" class="form-control" [(ngModel)]="model" + <input id="typeahead-focus" type="text" class="form-control" [(ngModel)]="modelContact.ctTab" [ngbTypeahead]="search" (focus)="focus$.next($any($event).target.value)" (click)="click$.next($any($event).target.value)" #instance="ngbTypeahead" /> </div> + <div class="col-6 mb-1"> + <label for="exampleFormControlSelect1">วันที่เริ่มต้น</label> + <input type="date" class="form-control" value="" [(ngModel)]="modelContact.sDate"> + </div> </div> <div class=" row"> <div class=" col-md-12"> @@ -28,8 +34,10 @@ </div> <div class="card-footer"> <div class="d-grid gap-2 d-md-flex justify-content-md-center"> - <button class="btn btn-primary btn-sm" type="submit" [disabled]="" (click)="saveContact()">บันทึก</button> - <button class="btn btn-primary btn-sm" type="cancel" (click)="model.dismiss('Cross click')">ยกเลิก</button> + <button class="btn btn-primary btn-sm" [disabled]="" type="submit" + (click)="saveContact()">บันทึก</button> + <button class="btn btn-primary btn-sm" type="cancel" + (click)="model.dismiss('Cross click')">ยกเลิก</button> </div> </div> </div> @@ -102,32 +110,32 @@ [(ngModel)]="modelContact.ctHead" /> </div> </div> - </div> - <div class=" row"> - <div class=" col-md-12"> - <div class=" form-group"> - <label> หน้าต่างที่มี BUG </label> - <input readonly class=" form-control" placeholder="" type="text" - [(ngModel)]="modelContact.ctTab" /> + <div class=" row"> + <div class=" col-md-12"> + <div class=" form-group"> + <label> หน้าต่างที่มี BUG </label> + <input readonly class=" form-control" placeholder="" type="text" + [(ngModel)]="modelContact.ctTab" /> + </div> </div> </div> - </div> - <div class=" row"> - <div class=" col-md-12"> - <div class=" form-group"> - <label> ชื่อผู้แจ้ง </label> - <input readonly class=" form-control" placeholder="" type="text" - [(ngModel)]="modelContact.ctName" /> + <div class=" row"> + <div class=" col-md-12"> + <div class=" form-group"> + <label> ชื่อผู้แจ้ง </label> + <input readonly class=" form-control" placeholder="" type="text" + [(ngModel)]="modelContact.ctName" /> + </div> </div> </div> - </div> - <div class="row"> - <div class="col-sm-12 mb-1"> - <label for="exampleFormControlSelect1">วันที่แจ้ง</label> - <input readonly type="date" class="form-control" [(ngModel)]="sDate"> + <div class="row"> + <div class="col-sm-12 mb-1"> + <label for="exampleFormControlSelect1">วันที่แจ้ง</label> + <input readonly type="date" class="form-control" [(ngModel)]="sDate"> + </div> </div> </div> </div> </div> </div> -</ng-template> \ No newline at end of file +</ng-template> diff --git a/src/app/service/contact.service.ts b/src/app/service/contact.service.ts index a03c817..4e9ec02 100644 --- a/src/app/service/contact.service.ts +++ b/src/app/service/contact.service.ts @@ -1,6 +1,6 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Contact } from "../models/contact.model"; +import { Contact, SearchContactModel } from "../models/contact.model"; @Injectable({ providedIn: 'root' }) export class ContactService { @@ -25,5 +25,15 @@ export class ContactService { getListContact() { return this.listContact; } + + searchListContact(searchModel: SearchContactModel) { + this.http.get(this.url + '&startDate=' + searchModel.sDate.split("-")[2] + '-' + searchModel.sDate.split("-")[1] + '-' + searchModel.sDate.split("-")[0] ).subscribe((response: any) => { + console.log(response); + this.listContact = response; + }, error => { + console.log(error) + alert("ไม่สามารถค้นหาได้ เนื่องจาก :\n" + error.message) + }) + } } diff --git a/src/app/service/room.service.ts b/src/app/service/room.service.ts index fe4e07c..e88f122 100644 --- a/src/app/service/room.service.ts +++ b/src/app/service/room.service.ts @@ -220,7 +220,7 @@ export class RoomService { this.listRoomSearch = response; }, error => { console.log(error) - alert("ไม่สามารถค้นหาห้องประขุมที่ว่างได้ เนื่องจาก :\n" + error.message) + alert("ไม่สามารถค้นหาห้องประชุมที่ว่างได้ เนื่องจาก :\n" + error.message) }) } -- libgit2 0.26.0