classification

src/app/External-Page/external-page-header/external-page-header.component.css

@@ -626,7 +626,7 @@ input,button {
     }
 
     .logoHeader-w .rightLogo-w img {
-        width: 160px;
+        width: 144px;
         margin: 0;
         margin-right: -15px;
     }

src/app/dashboard/definition-of-classification/definition-add/definition-add.component.html

@@ -44,7 +44,7 @@
                 </div>
               <div class="col-12 col-sm-6 col-md-4 col-lg-4">
                 <div class="form-group">
-                  <label for="status">الحاله <span class="spanReqired-w">*</span></label>
+                  <label for="status" style="float: right; margin-right: 5px">الحاله <span class="spanReqired-w">*</span></label>
                   <select name="status" class="form-control" [ngModel]="formData.status">
                     <option value="1">فعال</option>
                     <option value="0">غير فعال</option>

src/app/dashboard/definition-of-location/location-add/location-add.component.html

@@ -32,13 +32,13 @@
                 </div>
                 <div class="col-12 col-sm-12 col-md-4">
                     <div class="form-group">
-                      <label for="name" style="float: right; margin-right: 5px">اسم التصنيف<span class="spanReqired-w">*</span></label>
-                      <input type="text" class="form-control" id="name" name="name" placeholder="اسم التصنيف" ngModel [ngModel]="formData.name" required/>
+                      <label for="name" style="float: right; margin-right: 5px">اسم الموقع<span class="spanReqired-w">*</span></label>
+                      <input type="text" class="form-control" id="name" name="name" placeholder="اسم الموقع" ngModel [ngModel]="formData.name" required/>
                     </div>
                   </div>
                 <div class="col-12 col-sm-6 col-md-4 col-lg-4">
                 <div class="form-group">
-                  <label for="status">الحاله <span class="spanReqired-w">*</span></label>
+                  <label for="status" style="float: right; margin-right: 5px">الحاله <span class="spanReqired-w">*</span></label>
                   <select name="status" class="form-control" [ngModel]="formData.status">
                     <option value="1">فعال</option>
                     <option value="0">غير فعال</option>

src/app/dashboard/definition-of-location/location-list/location-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>
@@ -61,7 +61,7 @@
             </div>
           </th>
          
-          <th>اسم التصنيف </th>
+          <th>اسم الموقع </th>
           <th>الأب</th>
           <th>فعال</th>
 

src/app/dashboard/follow-communications-adminstrations/follow-communications-adminstration-edit/follow-communications-adminstration-edit.component.html

@@ -370,6 +370,7 @@
             <div class="col-12">
               <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid || checkSaveClick" *ngIf="!checkStatusClosed">حفظ</button>
               <!-- <button type="button" class="btn btn-primary rightW" *ngIf="checkStatusClosed" (click)="reOpenMaintenance()">إعاده فتح البلاغ</button> -->
+              <button type="button" class="btn btn-primary rightW" (click)="onPrint()" *ngIf="maintData.reopen == 1">طباعه</button>
               <button type="button" class="btn btn-warning rightW" (click)="authSer.backFromEdit()" style="margin:20px 10px;">إلغاء</button>
             </div>
             

src/app/dashboard/follow-communications-adminstrations/follow-communications-adminstration-edit/follow-communications-adminstration-edit.component.ts

@@ -95,9 +95,9 @@ export class FollowCommunicationsAdminstrationEditComponent implements OnInit {
       this.userAdminstrationId = +localStorage.getItem('adminId');
       //reload page every 10 seconds
      
-      // setTimeout(function(){
-      //   location.reload(); 
-      // },180000);
+      setTimeout(function(){
+        location.reload(); 
+      },180000);
 
   
 
@@ -367,6 +367,10 @@ export class FollowCommunicationsAdminstrationEditComponent implements OnInit {
       }
     }
 
+    //on print
+    onPrint() {
+      window.print();
+    }
 
   //submitted form 
   onSubmittedForm() {

src/app/dashboard/follow-communications-sections/follow-communication-sections-details/follow-communication-sections-details.component.html

@@ -365,6 +365,7 @@
             <div class="col-12">
               <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid || checkSaveClick">حفظ</button>
               <!-- <button type="button" class="btn btn-primary rightW" *ngIf="checkStatusClosed" (click)="reOpenMaintenance()">إعاده فتح البلاغ</button> -->
+              <button type="button" class="btn btn-primary rightW" (click)="onPrint()" *ngIf="maintData.reopen == 1">طباعه</button>
               <button type="button" class="btn btn-warning rightW" (click)="authSer.backFromEdit()" style="margin:20px 10px;">إلغاء</button>
             </div>
             

src/app/dashboard/follow-communications-sections/follow-communication-sections-details/follow-communication-sections-details.component.ts

@@ -95,10 +95,9 @@ export class FollowCommunicationSectionsDetailsComponent implements OnInit {
 
       this.userAdminstrationId = +localStorage.getItem('adminId');
       //reload page every 10 seconds
-     
-      // setTimeout(function(){
-      //   location.reload(); 
-      // },180000);
+      setTimeout(function(){
+        location.reload(); 
+      },180000);
 
   
 
@@ -365,6 +364,12 @@ export class FollowCommunicationSectionsDetailsComponent implements OnInit {
     }
 
 
+    //on print
+    onPrint() {
+      window.print();
+    }
+
+
   //submitted form 
   onSubmittedForm() {
     

src/app/dashboard/maintenance-communications/maintenance-communication-edit/maintenance-communication-edit.component.html

@@ -309,11 +309,13 @@
               <div class="col-12">
                 <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid || checkSaveClick" *ngIf="!checkStatusClosed">حفظ</button>
                 <button type="button" class="btn btn-primary rightW" *ngIf="checkStatusClosed" (click)="reOpenMaintenance()">إعاده فتح البلاغ</button>
+                <button type="button" class="btn btn-primary rightW" (click)="onPrint()" *ngIf="maintData.reopen == 1">طباعه</button>
                 <button type="button" class="btn btn-warning rightW" (click)="authSer.backFromEdit()" style="margin:20px 10px;">إلغاء</button>
               </div>
             </div>
           </form>
         </div>
+
     </div>
   </div>
   

src/app/dashboard/maintenance-communications/maintenance-communication-edit/maintenance-communication-edit.component.ts

@@ -89,9 +89,9 @@ export class MaintenanceCommunicationEditComponent implements OnInit {
       this.authSer.internalHeader = false;
 
       //reload page every 10 seconds
-      // setTimeout(function(){
-      //   location.reload(); 
-      // },180000);
+      setTimeout(function(){
+        location.reload(); 
+      },180000);
 
 
   
@@ -367,6 +367,28 @@ returnEditData() {
 }
 
 
+//on print function
+onPrint(): void {
+  window.print();
+  // let printContents, popupWin;
+  // printContents = document.getElementById('print-section').innerHTML;
+  // popupWin = window.open('', '_blank', 'top=0,left=0,height=100%,width=auto');
+  // popupWin.document.open();
+  // popupWin.document.write(`
+  //   <html>
+  //     <head>
+  //       <title> طباعه بطاقه المتدرب</title>
+  //       <style>
+  //       //........Customized style.......
+  //       </style>
+  //     </head>
+  // <body onload="window.print();window.close()">${printContents}</body>
+  //   </html>`
+  // );
+  // popupWin.document.close();
+}
+
+
   //submitted form 
   onSubmittedForm() {