Merge branch 'master' of https://mygit.myhr.co.th/chanachai.pmg.eng/BookingMyHrManagement

src/app/pages/admin-pending/admin-pending.component.html

@@ -48,15 +48,15 @@
             <div class="card">
                 <div class="card-body">
                     <div ngbDropdown class="d-inline-block">
-                        <button class="btn btn-outline-primary" id="dropdownBasic1"
-                            ngbDropdownToggle>ค้นหา</button>
+                        <button class="btn btn-sm btn-outline-primary" id="dropdownBasic1"
+                            ngbDropdownToggle>ประเภทการค้นหา</button>
                         <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
                             <button ngbDropdownItem>รอดำเนินการ</button>
                             <button ngbDropdownItem>อนุมัติ</button>
                             <button ngbDropdownItem>ยกเลิก</button>
                             <button ngbDropdownItem>สำเร็จแล้ว</button>
                         </div>
-                        <button class="btn btn-outline-success" type="submit">Search</button>
+                        <button class="btn btn-sm btn-outline-success" type="submit">Search</button>
                     </div>
                 </div>
             </div>

src/app/pages/home-page/home-page.component.html

@@ -48,15 +48,15 @@
             <div class="card">
                 <div class="card-body">
                     <div ngbDropdown class="d-inline-block">
-                        <button class="btn btn-outline-primary" id="dropdownBasic1"
-                            ngbDropdownToggle>ค้นหา</button>
+                        <button class="btn btn-sm btn-outline-primary" id="dropdownBasic1"
+                            ngbDropdownToggle>ประเภทการค้นหา</button>
                         <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
                             <button ngbDropdownItem>รอดำเนินการ</button>
                             <button ngbDropdownItem>อนุมัติ</button>
                             <button ngbDropdownItem>ยกเลิก</button>
                             <button ngbDropdownItem>สำเร็จแล้ว</button>
                         </div>
-                        <button class="btn btn-outline-success" type="submit">Search</button>
+                        <button class="btn btn-sm btn-outline-success" type="submit">Search</button>
                     </div>
                 </div>
             </div>
@@ -68,16 +68,16 @@
             <div class="card">
                 <div class="card-body">
                     <ul ngbNav #nav="ngbNav" [(activeId)]="active" (navChange)="onNavChange($event)" class="nav-tabs">
-                        <li  [ngbNavItem]="1">
+                        <li [ngbNavItem]="1">
                             <a ngbNavLink>ปฏิทินการจองห้อง</a>
                             <ng-template ngbNavContent>
-                                    <full-calendar #calendarBook [options]="calendarOptions"></full-calendar>
+                                <full-calendar #calendarBook [options]="calendarOptions"></full-calendar>
                             </ng-template>
                         </li>
-                        <li  [ngbNavItem]="2">
+                        <li [ngbNavItem]="2">
                             <a ngbNavLink>ปฏิทินการยืมรถ</a>
                             <ng-template ngbNavContent>
-                                <full-calendar  #calendar [options]="calendarOptions"></full-calendar>
+                                <full-calendar #calendar [options]="calendarOptions"></full-calendar>
                             </ng-template>
                         </li>
                     </ul>

src/app/pages/home-page/home-page.component.ts

@@ -80,6 +80,7 @@ export class HomePageComponent implements OnInit {
 
   calendarOptions: CalendarOptions;
   showBook = false;
+
   handleDateClick(arg) {
     alert('date click! ' + arg.dateStr)
   }
@@ -132,8 +133,6 @@ export class HomePageComponent implements OnInit {
 
 
   onNavChange(changeEvent: NgbNavChangeEvent) {
-    
-
     setTimeout(function () {
       window.dispatchEvent(new Event('resize'))
     },250);

src/app/pages/pending/pending.component.html

@@ -48,15 +48,15 @@
             <div class="card">
                 <div class="card-body">
                     <div ngbDropdown class="d-inline-block">
-                        <button class="btn btn-outline-primary" id="dropdownBasic1"
-                            ngbDropdownToggle>ค้นหา</button>
+                        <button class="btn btn-sm btn-outline-primary" id="dropdownBasic1"
+                            ngbDropdownToggle>ประเภทการค้นหา</button>
                         <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
                             <button ngbDropdownItem>รอดำเนินการ</button>
                             <button ngbDropdownItem>อนุมัติ</button>
                             <button ngbDropdownItem>ยกเลิก</button>
                             <button ngbDropdownItem>สำเร็จแล้ว</button>
                         </div>
-                        <button class="btn btn-outline-success" type="submit">Search</button>
+                        <button class="btn btn-sm btn-outline-success" type="submit">Search</button>
                     </div>
                 </div>
             </div>