amr пре 6 година
родитељ
комит
e8546f8efa

+ 1 - 0
src/app/dashboard/definition-of-location/location-list/location-list.component.ts

@@ -130,6 +130,7 @@ checkIfAllSelected() {
   this.currentPage = 1;
   console.log('search curent page', this.currentPage);
   console.log('search page id', this.pageId);
+
   this.dashboardSer.getDataUSerSearchBar(dataSearch, this.pageId, this.currentPage, this.dataTableNumber).subscribe(
     (responce) => {
       console.log(responce);

+ 1 - 1
src/app/dashboard/definition-of-time/definition-time-list/definition-time-list.component.html

@@ -17,7 +17,7 @@
       </div>
       <div class="col-12 col-sm-12 col-md-6 col-lg-6">
         <div class="form-group">
-          <input type="text" placeholder="البحث (اسم التصنيف	)" class="form-control inputSearchTable-w" style="margin-top:13px;" (input)="filtterFunc($event)"/>
+          <input type="text" placeholder="البحث (اسم المدة	)" class="form-control inputSearchTable-w" style="margin-top:13px;" (input)="filtterFunc($event)"/>
           <hr>
         </div>
       </div>

+ 2 - 2
src/app/shared/dashboard.service.ts

@@ -26,8 +26,8 @@ export class DashboardService {
 
      //get data user from searchBar
      getDataUSerSearchBar(data, pageId, pagenationNumber, dataTableNumber) {
-      console.log('url', this.authService.pathApi + '/page_list' + '/' + pageId + '/' + pagenationNumber + '/' + dataTableNumber + '/1/' + data);
       if(pageId == 40) {
+        console.log('url', this.authService.pathApi + '/page_list' + '/' + pageId + '/' + pagenationNumber + '/' + dataTableNumber + '/1/' + data);
         return this.http.get(this.authService.pathApi + '/page_list' + '/' + pageId + '/' + pagenationNumber + '/' + dataTableNumber + '/1/' + data);
       } else {
         console.log('urrrrrl',this.authService.pathApi + '/page_list' + '/' + pageId + '/' + pagenationNumber + '/' + dataTableNumber + '/all/' );
@@ -314,7 +314,7 @@ export class DashboardService {
       }else if(pageId == 52) {
         return this.http.post(this.authService.pathApi + '/delete_location', {'locations_id' : dataIds});
       }else if(pageId == 53) {
-        return this.http.post(this.authService.pathApi + '/delete_time_period', {'time_periods' : dataIds});
+        return this.http.post(this.authService.pathApi + '/delete_time_period', {'time_periods_id' : dataIds});
       }