Commit faad4a2e by GAME\parin

update typesearch

parent 7fe5b3b3
...@@ -55,10 +55,9 @@ ...@@ -55,10 +55,9 @@
<button class="btn btn-sm btn-outline-primary" id="dropdownBasic1" <button class="btn btn-sm btn-outline-primary" id="dropdownBasic1"
ngbDropdownToggle>ประเภทการค้นหา</button> ngbDropdownToggle>ประเภทการค้นหา</button>
<div ngbDropdownMenu aria-labelledby="dropdownBasic1"> <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
<button ngbDropdownItem>รอดำเนินการ</button> <button ngbDropdownItem>จอง</button>
<button ngbDropdownItem>อนุมัติ</button> <button ngbDropdownItem>ไม่อนุมัติ</button>
<button ngbDropdownItem>ยกเลิก</button> <button ngbDropdownItem>ยกเลิก</button>
<button ngbDropdownItem>สำเร็จแล้ว</button>
</div> </div>
<button class="btn btn-sm btn-outline-success" <button class="btn btn-sm btn-outline-success"
type="submit" (click)="openSearchRoom()">Search</button> type="submit" (click)="openSearchRoom()">Search</button>
......
...@@ -55,10 +55,9 @@ ...@@ -55,10 +55,9 @@
<button class="btn btn-sm btn-outline-primary" id="dropdownBasic1" <button class="btn btn-sm btn-outline-primary" id="dropdownBasic1"
ngbDropdownToggle>ประเภทการค้นหา</button> ngbDropdownToggle>ประเภทการค้นหา</button>
<div ngbDropdownMenu aria-labelledby="dropdownBasic1"> <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
<button ngbDropdownItem>รอดำเนินการ</button> <button ngbDropdownItem>จอง</button>
<button ngbDropdownItem>อนุมัติ</button> <button ngbDropdownItem>ไม่อนุมัติ</button>
<button ngbDropdownItem>ยกเลิก</button> <button ngbDropdownItem>ยกเลิก</button>
<button ngbDropdownItem>สำเร็จแล้ว</button>
</div> </div>
<button class="btn btn-sm btn-outline-success" <button class="btn btn-sm btn-outline-success"
type="submit">Search</button> type="submit">Search</button>
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<div class="form-group hidden"> <div class="form-group hidden">
<div class="input-group"> <div class="input-group">
<input name="datepicker" class="form-control" ngbDatepicker <input name="datepicker" class="form-control" ngbDatepicker
[(ngModel)]="searchroomModel.sDate" [(ngModel)]="searchroomModel.eDate" [(ngModel)]="searchroomModel.sDate"
#datepicker="ngbDatepicker" [(ngModel)]="searchroomModel.eDate" #datepicker="ngbDatepicker"
[autoClose]="'outside'" (dateSelect)="onDateSelection($event)" [autoClose]="'outside'" (dateSelect)="onDateSelection($event)"
[displayMonths]="2" [dayTemplate]="t" outsideDays="hidden" [displayMonths]="2" [dayTemplate]="t" outsideDays="hidden"
[startDate]="fromDate!" tabindex="-1"> [startDate]="fromDate!" tabindex="-1">
...@@ -56,10 +56,9 @@ ...@@ -56,10 +56,9 @@
<button class="btn btn-sm btn-outline-primary" id="dropdownBasic1" <button class="btn btn-sm btn-outline-primary" id="dropdownBasic1"
ngbDropdownToggle>ประเภทการค้นหา</button> ngbDropdownToggle>ประเภทการค้นหา</button>
<div ngbDropdownMenu aria-labelledby="dropdownBasic1"> <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
<button ngbDropdownItem>รอดำเนินการ</button> <button ngbDropdownItem>จอง</button>
<button ngbDropdownItem>อนุมัติ</button> <button ngbDropdownItem>ไม่อนุมัติ</button>
<button ngbDropdownItem>ยกเลิก</button> <button ngbDropdownItem>ยกเลิก</button>
<button ngbDropdownItem>สำเร็จแล้ว</button>
</div> </div>
<button class="btn btn-sm btn-outline-success" type="submit" <button class="btn btn-sm btn-outline-success" type="submit"
(click)="openSearchRoom()">Search</button> (click)="openSearchRoom()">Search</button>
...@@ -138,10 +137,11 @@ ...@@ -138,10 +137,11 @@
<div class="form-group hidden"> <div class="form-group hidden">
<div class="input-group"> <div class="input-group">
<input name="datepicker" class="form-control" ngbDatepicker <input name="datepicker" class="form-control" ngbDatepicker
[(ngModel)]="searcheqModel.sDate" #datepicker="ngbDatepicker" [(ngModel)]="searcheqModel.sDate" [(ngModel)]="searcheqModel.eDate"
[autoClose]="'outside'" (dateSelect)="onDateSelection($event)" #datepicker="ngbDatepicker" [autoClose]="'outside'"
[displayMonths]="2" [dayTemplate]="t" outsideDays="hidden" (dateSelect)="onDateSelection($event)" [displayMonths]="2"
[startDate]="fromDate!" tabindex="-1"> [dayTemplate]="t" outsideDays="hidden" [startDate]="fromDate!"
tabindex="-1">
<ng-template #t let-date let-focused="focused"> <ng-template #t let-date let-focused="focused">
<span class="custom-day" [class.focused]="focused" <span class="custom-day" [class.focused]="focused"
[class.range]="isRange(date)" [class.range]="isRange(date)"
......
...@@ -7,7 +7,7 @@ import { Contact } from "../models/contact.model"; ...@@ -7,7 +7,7 @@ import { Contact } from "../models/contact.model";
export class ContactService { export class ContactService {
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
url: string = "http://5fa9-110-169-221-194.ngrok.io"; url: string = "http://5d75-2405-9800-bc03-3665-394e-33ce-7fe3-2ed5.ngrok.io";
listContact: Contact[] = [] listContact: Contact[] = []
addContact(model: Contact) { addContact(model: Contact) {
...@@ -25,5 +25,4 @@ export class ContactService { ...@@ -25,5 +25,4 @@ export class ContactService {
getListContact(): Observable<Contact[]> { getListContact(): Observable<Contact[]> {
return this.http.get<Contact[]>(this.url + "/contact/lists"); return this.http.get<Contact[]>(this.url + "/contact/lists");
} }
} }
\ No newline at end of file
...@@ -9,7 +9,7 @@ import { Type } from '../models/type.model'; ...@@ -9,7 +9,7 @@ import { Type } from '../models/type.model';
export class EquirmentService { export class EquirmentService {
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
url: string = "http://5fa9-110-169-221-194.ngrok.io"; url: string = "http://5d75-2405-9800-bc03-3665-394e-33ce-7fe3-2ed5.ngrok.io";
listEquirment: Equirment[] = [] listEquirment: Equirment[] = []
addEquirment(model: Equirment) { addEquirment(model: Equirment) {
......
...@@ -7,7 +7,7 @@ import { Observable } from 'rxjs'; ...@@ -7,7 +7,7 @@ import { Observable } from 'rxjs';
export class ItemDetailService { export class ItemDetailService {
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
url: string = "http://5fa9-110-169-221-194.ngrok.io"; url: string = "http://5d75-2405-9800-bc03-3665-394e-33ce-7fe3-2ed5.ngrok.io";
listItemDetail: ItemDetail[] = [] listItemDetail: ItemDetail[] = []
addItemDetail(model: ItemDetail) { addItemDetail(model: ItemDetail) {
......
...@@ -11,7 +11,7 @@ export class RoomDetailService { ...@@ -11,7 +11,7 @@ export class RoomDetailService {
} }
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
url: string = "http://5fa9-110-169-221-194.ngrok.io"; url: string = "http://5d75-2405-9800-bc03-3665-394e-33ce-7fe3-2ed5.ngrok.io";
listRoomDetail: RoomDetail[] = [] listRoomDetail: RoomDetail[] = []
editRoomDetail(model: RoomDetail) { editRoomDetail(model: RoomDetail) {
......
...@@ -8,7 +8,7 @@ import { SearchRoomModel } from '../models/searchroom.model'; ...@@ -8,7 +8,7 @@ import { SearchRoomModel } from '../models/searchroom.model';
export class RoomService { export class RoomService {
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
url: string = "http://5fa9-110-169-221-194.ngrok.io"; url: string = "http://5d75-2405-9800-bc03-3665-394e-33ce-7fe3-2ed5.ngrok.io";
listRoomModel: Room[] = [] listRoomModel: Room[] = []
listRoomSearch: Room[] = []; listRoomSearch: Room[] = [];
......
...@@ -7,7 +7,7 @@ import { SearchEqModel } from '../models/searcheq.model'; ...@@ -7,7 +7,7 @@ import { SearchEqModel } from '../models/searcheq.model';
export class SearchService { export class SearchService {
constructor(private http: HttpClient) {} constructor(private http: HttpClient) {}
url: string = "http://5fa9-110-169-221-194.ngrok.io"; url: string = "http://5d75-2405-9800-bc03-3665-394e-33ce-7fe3-2ed5.ngrok.io";
listSearchEq: SearchEqModel[] = [] listSearchEq: SearchEqModel[] = []
getSearchEq(model: SearchEqModel){ getSearchEq(model: SearchEqModel){
......
...@@ -10,7 +10,7 @@ export class TypeService { ...@@ -10,7 +10,7 @@ export class TypeService {
// } // }
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
url: string = "http://5fa9-110-169-221-194.ngrok.io"; url: string = "http://5d75-2405-9800-bc03-3665-394e-33ce-7fe3-2ed5.ngrok.io";
listType: Type[] = [] listType: Type[] = []
addType(model: Type) { addType(model: Type) {
......
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