src/app/External-Page/external-page-content/external-page-content.component.html

@@ -72,7 +72,7 @@
                           <div id="carouselExample" class="carousel slide" data-ride="carousel" data-interval="9000">
                             <div class="carousel-inner row w-100 mx-auto" role="listbox">
                                 <div class="carousel-item cslide" *ngFor="let image of firstAdvertisiment;let i = index" [ngClass]="i == 0 ? 'active' : '' ">
-                                    <img class="img-fluid mx-auto d-block" src="{{authSer.pathImg + image.photo}}" alt="slide 1">
+                                   <a target="_blank" href="{{image.link}}"> <img class="img-fluid mx-auto d-block" src="{{authSer.pathImg + image.photo}}" alt="slide 1"></a>
                                 </div>
                             </div>
                             <a class="carousel-control-prev" href="#carouselExample" role="button" data-slide="prev">
@@ -88,7 +88,7 @@
                           <div id="carouselExample2" class="carousel slide" data-ride="carousel" data-interval="9000">
                             <div class="carousel-inner row w-100 mx-auto" role="listbox">
                               <div class="carousel-item cslide" *ngFor="let slide2 of secondAdvertisiment;let i = index" [ngClass]=" i == 0 ? 'active' : '' ">
-                                  <img class="img-fluid mx-auto d-block" src="{{authSer.pathImg + slide2.photo}}" alt="slide 1">
+                                <a target="_blank" href="{{slide2.link}}"><img class="img-fluid mx-auto d-block" src="{{authSer.pathImg + slide2.photo}}" alt="slide 1"></a>
                               </div>
                             </div>
                             <a class="carousel-control-prev" href="#carouselExample2" role="button" data-slide="prev">
@@ -285,7 +285,7 @@
                       <div id="carouselExample" class="carousel slide" data-ride="carousel" data-interval="9000">
                         <div class="carousel-inner row w-100 mx-auto" role="listbox">
                             <div class="carousel-item col-md-4" *ngFor="let image of firstAdvertisiment;let i = index" [ngClass]="i == 0 ? 'active' : '' ">
-                                <img class="img-fluid mx-auto d-block" src="{{authSer.pathImg + image.photo}}" alt="slide 1">
+                                <a target="_blank" href="{{image.link}}"><img class="img-fluid mx-auto d-block" src="{{authSer.pathImg + image.photo}}" alt="slide 1"></a>
                             </div>
                         </div>
                         <a class="carousel-control-prev" href="#carouselExample" role="button" data-slide="prev">
@@ -301,7 +301,7 @@
                       <div id="carouselExample2" class="carousel slide" data-ride="carousel" data-interval="9000">
                         <div class="carousel-inner row w-100 mx-auto" role="listbox">
                           <div class="carousel-item col-md-4" *ngFor="let slide2 of secondAdvertisiment;let i = index" [ngClass]=" i == 0 ? 'active' : '' ">
-                              <img class="img-fluid mx-auto d-block" src="{{authSer.pathImg + slide2.photo}}" alt="slide 1">
+                             <a target="_blank" href="{{slide2.link}}"><img class="img-fluid mx-auto d-block" src="{{authSer.pathImg + slide2.photo}}" alt="slide 1"></a> 
                           </div>
                         </div>
                         <a class="carousel-control-prev" href="#carouselExample2" role="button" data-slide="prev">

src/app/External-Page/external-page-content/external-page-content.component.ts

@@ -91,6 +91,7 @@ export class ExternalPageContentComponent implements OnInit, OnDestroy {
         this.events = responce['data'].events;
         this.services = responce['data'].external_services;
         this.firstAdvertisiment = responce['data'].first_advertising_services_row;
+        console.log('first adverrrr', this.firstAdvertisiment);
         this.secondAdvertisiment = responce['data'].second_advertising_services_row;
         this.hypnosisSections = responce['data'].visiting_times_hs;
         this.intensiveCare = responce['data'].visiting_times_ic;

src/app/app-routing.module.ts

@@ -4,7 +4,6 @@ import { CanDeactivateGuard } from './shared/can-deactivate-guards.service';
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule, PreloadAllModules } from '@angular/router';
 import { LoginComponent } from './auth-services/login/login.component';
-import { RegesterComponent } from './auth-services/regester/regester.component';
 import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
 import { AuthGuardService as AuthGuard } from './shared/auth-guard.service';
 import { ServicesComponent } from './servicesItems/services.component';
@@ -12,7 +11,7 @@ import { TrainningServicesComponent } from './trainning-service/trainning-servic
 
 
 const routes: Routes = [
-  {path: '', redirectTo: '/ExternalPage', pathMatch: 'full'},
+  {path: '', redirectTo: '/InternalPage', pathMatch: 'full'},
   {path: 'auth', loadChildren:'./auth-services/auth-services.module#AuthServicesModule'},
   {path: 'InternalPage' , loadChildren: './Internal-Page/internal-page.module#InternalPageModule', canLoad: [AuthGuard]},
   {path: 'ExternalPage', loadChildren: './External-Page/external-page.module#ExternalPageModule', canLoad: [AuthGuard]},

src/app/app.module.ts

@@ -48,7 +48,6 @@ import { JwSocialButtonsModule } from 'jw-angular-social-buttons';
 
 import { Ng2CarouselamosModule } from 'ng2-carouselamos';
 import { NumberDerictiveDirective } from './number-derictive.directive';
-import { OnlyNumberDirective } from './shared/only-number.directive';
 import {SharedModule} from './shared/shared.module';
 import { AddRequestComponent } from './trainning-service/add-request/add-request.component';
 import { AllRequestsComponent } from './trainning-service/all-requests/all-requests.component';
@@ -61,8 +60,6 @@ import { AuthServicesModule } from './auth-services/auth-services.module';
     AppComponent,
     HeaderComponent,
     FooterComponent,
-    // LoginComponent,
-    // RegesterComponent,
     ServicesComponent,
     PageNotFoundComponent,
     NumberDerictiveDirective,

src/app/auth-services/regester/regester.component.html

@@ -25,7 +25,7 @@
             </div>
           </div>
 
-          <div class="col-12 col-sm-12 col-md-6 col-lg-4" *ngIf="showTypeInput">
+          <!-- <div class="col-12 col-sm-12 col-md-6 col-lg-4" *ngIf="showTypeInput">
             <div class="form-group">
               <label style="float: right; margin-right:5px;margin-top:10px">الحاله <span class="spanReqired-w">*</span></label>
               <div class="custom-control custom-radio inlineBlock-w" style="padding: 2px 31px;background: #bd90592e;color: #a98559;border: 1px solid #b38553c2;">
@@ -39,7 +39,7 @@
               </div>
 
             </div>
-          </div>
+          </div> -->
 			
 			<div class="col-sm-12 col-md-12 col-lg-12">
 				<div class="row">
@@ -78,7 +78,7 @@
 							<div class="col-12 col-sm-12 col-md-6 col-lg-4" *ngIf="identity_id != 4">
 							  <div class="form-group">
 								<label for="identityNumber" style="float:right">رقم الهويه <span class="spanReqired-w">*</span></label>
-								<input type="number" class="form-control" placeholder="رقم الهويه" id="identityNumber" formControlName="identity_number" appNumberDerictive (input)="onIdentitiyChange($event.target.value)" />
+								<input type="number" class="form-control" placeholder="رقم الهويه" id="identityNumber" formControlName="identity_number" appOnlyNumber (input)="onIdentitiyChange($event.target.value)" />
 								<span class="errorMessage-w" *ngIf="identity_id == 1">أدخل رقم هويه مكون من 10 أرقام يبدأ برقم 1</span>
 								<span class="errorMessage-w" *ngIf="identity_id == 2">أدخل رقم هويه مكون من 10 أرقام </span>
 								<span class="errorMessage-w" *ngIf="identity_id == 3">أدخل رقم الإقامه مكون من 10 أرقام يبدأ برقم 2 </span>
@@ -262,7 +262,7 @@
             <div class="col-12 col-sm-12 col-md-6 col-lg-4">
               <div class="form-group">
                 <label for="phone" style="float:right">رقم الجوال <span class="spanReqired-w">*</span></label>
-                <input type="text" id="phone" appNumberDerictive class="form-control" placeholder="رقم الجوال يبدأ ب 05 ومكون من 10 أرقام" formControlName="phone" />
+                <input type="text" id="phone" appOnlyNumber class="form-control" placeholder="رقم الجوال يبدأ ب 05 ومكون من 10 أرقام" formControlName="phone" />
               </div>
             </div>
 

src/app/dashboard/department/add-department/add-department.component.html

@@ -24,20 +24,20 @@
               <div class="col-12 col-sm-6 col-md-4 col-lg-4">
                 <div class="form-group">
                   <label for="email">الأيميل <span class="spanReqired-w">*</span></label>
-                  <input type="email" class="form-control" name="email" placeholder="الإيميل" appEnglishCharacters ngModel #email="ngModel" [ngModel]="admin.email" required/>
+                  <input type="email" class="form-control" name="email" placeholder="الإيميل" appEnglishCharacters ngModel #email="ngModel" email [ngModel]="admin.email" required/>
                   <span class="help-block" *ngIf="!email.valid && email.touched" style="color:red">من فضلك أدخل إيميل صحيح</span>
                 </div>
               </div>
               <div class="col-12 col-sm-6 col-md-4 col-lg-4">
                 <div class="form-group">
-                  <label for="phone">رقم الجوال</label>
-                  <input type="phone" class="form-control" appNumberDerictive name="phone" ngModel #phone="ngModel" [ngModel]="admin.phone"/>
+                  <label for="phone">رقم الهاتف</label>
+                  <input type="phone" class="form-control" appOnlyNumber name="phone" ngModel #phone="ngModel" [ngModel]="admin.phone"/>
                 </div>
               </div>
               <div class="col-12 col-sm-6 col-md-4 col-lg-4">
                 <div class="form-group">
-                  <label for="switch_phone">رقم الجوال البديل</label>
-                  <input type="phone" class="form-control" appNumberDerictive name="switch_phone" ngModel #switchPhone="ngModel" [ngModel]="admin.switch_phone"/>
+                  <label for="switch_phone">رقم التحويله</label>
+                  <input type="phone" class="form-control" appOnlyNumber name="switch_phone" ngModel #switchPhone="ngModel" [ngModel]="admin.switch_phone"/>
                 </div>
               </div>
               <div class="col-12 col-sm-6 col-md-4 col-lg-4">
@@ -51,8 +51,8 @@
               </div>
               <div class="col-12 col-sm-6 col-md-4 col-lg-4">
                 <div class="form-group">
-                  <label for="description">الوصف <span class="spanReqired-w">*</span></label>
-                  <textarea cols="3" name="description" class="form-control" ngModel #description="ngModel" [ngModel]="admin.description" required>
+                  <label for="description">الوصف</label>
+                  <textarea cols="3" name="description" class="form-control" [ngModel]="admin.description" >
                   </textarea>
                 </div>
               </div>

src/app/dashboard/events/add-event/add-event.component.html

@@ -86,8 +86,8 @@
               </div>
 
               <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                <label for="time" style="float: right; margin-right: 5px">الوقت</label>
-                <input type="time" class="form-control" [ngModel]="event.time" id="time" name="time" />
+                <label for="time" style="float: right; margin-right: 5px">الوقت <span class="spanReqired-w">*</span></label>
+                <input type="time" class="form-control" [(ngModel)]="event.time" id="time" name="time" required/>
               </div>
 
               <div class="col-12">

src/app/dashboard/events/add-event/add-event.component.ts

@@ -112,11 +112,10 @@ export class AddEventComponent implements OnInit {
   onSubmitted() {
     this.checkSaveClick = true;
     console.log(this.eventForm.value);
+    console.log(this.eventForm.value.time);
     this.eventForm.value['date'] = this.higriDateVal;
-    if(this.eventForm.value.time) {
-      this.eventForm.value.event_time = this.eventForm.value.date + ' ' + this.eventForm.value.time;
-    } else {
-      this.eventForm.value.event_time = this.eventForm.value.date + this.event.time;
+    if(this.event.time) {
+      this.eventForm.value.event_time = this.eventForm.value.date + ' ' + this.event.time;
     }
     console.log(this.eventForm.value.event_time);
     delete this.eventForm.value.time;
@@ -124,47 +123,47 @@ export class AddEventComponent implements OnInit {
 
     console.log(this.eventForm.value); 
     if(this.typeMode) {
-      this.dashboard.editItem( this.eventId ,this.eventForm.value , "events").subscribe(
-        (responce) => {
-          console.log(responce);
-          this.toastr.success('تمت التعديل بنجاح');
-          this.location.back();
-          this.checkSaveClick = false;
-        },
-        (error) => {
-          console.log(error.error['status']);
-          if(error.error.status == 'invalid event_time') {
-            this.toastr.warning('يجب ان يكون الحدث في وقت سابق !');
-          }else if(error.error['status'] == 'active status for only 4 records') {
-            this.toastr.warning('لديك أربعه أحداث في الحاله فعال بالفعل ، قم بعدم تفعيل أو مسح أحدهم ');
-          }else {
-            this.toastr.error('حدث خطأ !');
+        this.dashboard.editItem( this.eventId ,this.eventForm.value , "events").subscribe(
+          (responce) => {
+            console.log(responce);
+            this.toastr.success('تمت التعديل بنجاح');
+            this.location.back();
+            this.checkSaveClick = false;
+          },
+          (error) => {
+            console.log(error.error['status']);
+            if(error.error.status == 'invalid event_time') {
+              this.toastr.warning('يجب ان يكون الحدث في وقت سابق !');
+            }else if(error.error['status'] == 'active status for only 4 records') {
+              this.toastr.warning('لديك أربعه أحداث في الحاله فعال بالفعل ، قم بعدم تفعيل أو مسح أحدهم ');
+            }else {
+              this.toastr.error('حدث خطأ !');
+            }
+            console.log(error);
+            this.checkSaveClick = false;
           }
-          console.log(error);
-          this.checkSaveClick = false;
-        }
-      );
+        );
     } else {
-      this.dashboard.addItem(this.eventForm.value, "events").subscribe(
-        (responce) => {
-          console.log(responce);
-          this.toastr.success('تمت الاضافه بنجاح');
-          this.location.back();
-          this.checkSaveClick = false;
-        },
-        (error) => {
-          console.log(error.error['status']);
-          if(error.error.status == 'invalid event_time') {
-            this.toastr.warning('يجب ان يكون الحدث في وقت سابق !');
-          } else if(error.error['status'] == 'active status for only 4 records') {
-            this.toastr.warning('لديك أربعه أحداث في الحاله فعال بالفعل ، قم بعدم تفعيل أو مسح أحدهم ');
-          }else {
-            this.toastr.error('حدث خطأ !');
+        this.dashboard.addItem(this.eventForm.value, "events").subscribe(
+          (responce) => {
+            console.log(responce);
+            this.toastr.success('تمت الاضافه بنجاح');
+            this.location.back();
+            this.checkSaveClick = false;
+          },
+          (error) => {
+            console.log(error.error['status']);
+            if(error.error.status == 'invalid event_time') {
+              this.toastr.warning('يجب ان يكون الحدث في وقت سابق !');
+            } else if(error.error['status'] == 'active status for only 4 records') {
+              this.toastr.warning('لديك أربعه أحداث في الحاله فعال بالفعل ، قم بعدم تفعيل أو مسح أحدهم ');
+            }else {
+              this.toastr.error('حدث خطأ !');
+            }
+            console.log(error);
+            this.checkSaveClick = false;
           }
-          console.log(error);
-          this.checkSaveClick = false;
-        }
-      );
+        ); 
     }
   }
 

src/app/dashboard/external-services/add-external/add-external.component.ts

@@ -93,7 +93,7 @@ export class AddExternalComponent implements OnInit {
             }
           );
         } else {
-          this.typeLink = 'أنشاء جديد';
+          this.typeLink = 'إنشاء جديد';
         }
       }
     );

src/app/dashboard/hospitals/add-hospital/add-hospital.component.html

@@ -29,11 +29,7 @@
                       <input type="text" class="form-control" placeholder="الأسم باللغه الإنجليزيه" formControlName="name_en"/>
                     </div>
                   </div>
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                        <button class="btn btn-secondary rightW" type="button" style="margin-top:33px" (click)="onAddTitle()">أضف المزيد من العناوين </button>
-                    </div>
-                  </div>
+                  
                   <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="showAppearance">
                     <div class="form-group">
                       <label style="float: right; margin: 5px 0">الظهور<span class="spanReqired-w">*</span></label>
@@ -44,6 +40,11 @@
                       </select>
                     </div>
                   </div>
+                  <div class="col-12 col-sm-12 col-md-12 col-lg-12">
+                    <div class="form-group">
+                        <button class="btn btn-secondary rightW" type="button" style="margin-top:33px" (click)="onAddTitle()">أضف المزيد من العناوين الفرعيه</button>
+                    </div>
+                  </div>
                 </div>
               
                 <div formArrayName="fields" *ngFor="let titleControl of addHospitalForm.get('fields')['controls']; let i = index" style="padding: 20px 0;">

src/app/dashboard/internal-services/add-internal-services/add-internal-services.component.css

@@ -97,3 +97,10 @@ input,select {
     padding: 20px;
     border-radius: 20px;
 }
+
+
+.custom-control-input {
+    z-index: 1;
+    opacity: 1;
+    margin-top: 7px;
+}

src/app/dashboard/internal-services/add-internal-services/add-internal-services.component.html

@@ -92,12 +92,12 @@
                               <div class="form-group">
                                 <div class="custom-control custom-radio inlineBlock-w">
                                   <input type="radio" class="custom-control-input" id="defaultUnchecked{{i}}" (change)="showCahngeRadio('internal',i)" value="internal" formControlName="link_type">
-                                  <label class="custom-control-label" for="defaultUnchecked{{i}}" style="cursor: pointer;">داخلي</label>
+                                  <label class="custom-control-label" for="defaultUnchecked{{i}}" style="cursor: pointer; margin:0 20px;">داخلي</label>
                                 </div>
                                 
                                 <div class="custom-control custom-radio inlineBlock-w">
                                   <input type="radio" class="custom-control-input" id="defaultChecked{{i}}" value="external" (change)="showCahngeRadio('external',i)" formControlName="link_type">
-                                  <label class="custom-control-label" for="defaultChecked{{i}}" style="cursor: pointer;">خارجي</label>
+                                  <label class="custom-control-label" for="defaultChecked{{i}}" style="cursor: pointer; margin:0 20px;">خارجي</label>
                                 </div>
                               </div>
                           </div>    

src/app/dashboard/main-menu/add-menu/add-menu.component.css

@@ -51,6 +51,8 @@ input,select {
 }
 
 
+
+
 /* .inputfile + label {
     width: 100%;
     font-size: 1.25em;
@@ -91,4 +93,5 @@ input,select {
 
 .ql-container  {
     min-height: 100px !important;
-}
+}
+

src/app/dashboard/main-menu/add-menu/add-menu.component.html

@@ -51,7 +51,6 @@
                           <option value="4">4</option>
                           <option value="5">5</option>
                           <option value="6">6</option>
-                          <option value="1000">المزيد</option>
                         </select>
                       </div>
                     </div>
@@ -88,7 +87,7 @@
                     </div>
 
                     <div class="col-12 col-sm-12 col-md-4 col-lg-4" style="margin: 10px 0;" *ngIf="menu.link_type == 'internal'">
-                      <label for="link" style="float: right; margin-right: 5px">الصفحات الخارجيه <span class="spanReqired-w">*</span> </label>
+                      <label for="link" style="float: right; margin-right: 5px"> أختر الصفحه الداخليه<span class="spanReqired-w">*</span> </label>
                       <select class="form-control" name="link" [ngModel]="menu.link" required>
                         <option *ngFor="let page of internalPages" [value]="page.id">{{page.name}}</option>
                       </select>

src/app/dashboard/main-menu/add-menu/add-menu.component.ts

@@ -182,6 +182,7 @@ export class AddMenuComponent implements OnInit {
     console.log(formData);
   }
   if(this.typeMode){
+    //Edit mode
     if(this.imageBase64 == '' && this.photoEdit == true){
       this.toastr.warning('قم باختيار صوره !');
       this.checkSaveClick = false;
@@ -220,10 +221,11 @@ export class AddMenuComponent implements OnInit {
       }
     }
   } else {
-    if(this.imageBase64 == ''){
+    //create mode
+    if(this.imageBase64 == '' && !formData.parent_id){
       this.toastr.warning('قم باختيار صوره !');
       this.checkSaveClick = false;
-    } else if(formData.photo_type != 'png'){
+    } else if(formData.photo_type != 'png' && !formData.parent_id){
       this.toastr.warning('الصوره يجب أن تكون بصيغه png');
       this.checkSaveClick = false;
     } else {

src/app/dashboard/report-communication/report-communications/report-communications.component.html

@@ -49,33 +49,6 @@
                     <input id="name" type="text" class="form-control" placeholder="الإداره" ngModel name="comm_adminstration_creator_name"  [(ngModel)]="userData.comm_adminstration_creator_name" [disabled]="disabledInput" />
                   </div>
                   </div>
-                
-
-                <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-                  <div class="form-group">
-                  <label style="float:right">رقم الجوال <span class="spanReqired-w">*</span></label>
-                  <input type="phone" placeholder="رقم الجوال" class="form-control" ngModel name="phone" [(ngModel)]="userData.comm_creator_phone" [disabled]="disabledInput" />
-                  </div>
-                </div>
-    
-                <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-                  <div class="form-group">
-                    <label for="endDate" style="float:right" >التاريخ<span class="spanReqired-w">*</span></label>
-                    <div *ngIf='bindingDateSplitEnd'>
-                      <app-end-higri-date  (onDatePicked)="getDate($event, 'end')" [myEndDate]="bindingDateSplitEnd" [higriDisabled]="disabledVal"> </app-end-higri-date>
-                    </div>
-                  </div>
-                </div>
-
-                <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-                  <div class="form-group">
-                    <label for="time" style="float:right"> الوقت<span class="spanReqired-w">*</span></label>
-                    <input type="time" id="time" placeholder="الوقت" class="form-control" ngModel name="time" [(ngModel)]="maintData.created_time" [disabled]="disabledInput" /> 
-                  </div>
-                </div>
-
-                
-
               </div>
             </div>
           </div>
@@ -116,6 +89,30 @@
                     </div>
                   </div>
 
+                  <div class="col-12 col-sm-12 col-md-6 col-lg-4">
+                    <div class="form-group">
+                    <label style="float:right">رقم الجوال <span class="spanReqired-w">*</span></label>
+                    <input type="phone" placeholder="رقم الجوال" class="form-control" ngModel name="phone" [(ngModel)]="userData.comm_creator_phone" [disabled]="disabledInput" />
+                    </div>
+                  </div>
+      
+                  <div class="col-12 col-sm-12 col-md-6 col-lg-4">
+                    <div class="form-group">
+                      <label for="endDate" style="float:right" >التاريخ<span class="spanReqired-w">*</span></label>
+                      <div *ngIf='bindingDateSplitEnd'>
+                        <app-end-higri-date  (onDatePicked)="getDate($event, 'end')" [myEndDate]="bindingDateSplitEnd" [higriDisabled]="disabledVal"> </app-end-higri-date>
+                      </div>
+                    </div>
+                  </div>
+  
+                  <div class="col-12 col-sm-12 col-md-6 col-lg-4">
+                    <div class="form-group">
+                      <label for="time" style="float:right"> الوقت<span class="spanReqired-w">*</span></label>
+                      <input type="time" id="time" placeholder="الوقت" class="form-control" ngModel name="time" [(ngModel)]="maintData.created_time" [disabled]="disabledInput" /> 
+                    </div>
+                  </div>
+  
+
                   <div class="col-12">
                     <h2 class="title">المرفقات</h2>
                     <div class="row">

src/app/dashboard/report-list/report-list.component.html

@@ -1,10 +1,10 @@
 <div class="reportList-w">
   <div class="container">
       <div class="containerContent-w">
-          <div class="row" *ngIf="permissionsTable">
+            <div class="row" *ngIf="!pagesTable">
               <div class="col-12 col-sm-12 col-md-6 col-lg-6">
                 <div class="form-group">
-                  <input type="text" placeholder="البحث عن الأسم" class="form-control rightFloat searchInput-w" style="margin-top:13px;" [(ngModel)]="name"/>
+                  <input type="text" placeholder="البحث ( بالاسم - رقم الهويه - الهاتف - الرقم الوظيفي )" class="form-control rightFloat searchInput-w" style="margin-top:13px;" [(ngModel)]="name"/>
                   <button class="btn btn-success leftFloat" (click)="onSearchName()">ابحث</button>
                 </div>
               </div>
@@ -13,20 +13,20 @@
             <table class="table table-bordered text-center" *ngIf="permissionsTable">
               <thead>
                 <tr>
-                  <th>الاسم</th>
-                  <th>البريد الإلكتروني</th>
-                  <th>التقارير</th>
+                  <th class="text-center">الاسم</th>
+                  <th class="text-center">البريد الإلكتروني</th>
+                  <th class="text-center">التقارير</th>
                 </tr>
               </thead>
               <tbody>
-                <tr *ngFor="let user of usersList; let i = index ">
-                  <td>{{user.name}}</td>
-                  <td>{{user.email}}</td>
-                  <td><button class="btn btn-outline-secondary" (click)="onGetReport(user.id)"><i class="fas fa-address-card"></i></button></td>
+                <tr>
+                  <td>{{usersList?.name ? usersList.name : ''}}</td>
+                  <td>{{usersList?.email ? usersList.email : ''}}</td>
+                  <td><button class="btn btn-outline-secondary" (click)="onGetReport(usersList.id)"><i class="fas fa-address-card"></i></button></td>
                 </tr>
               </tbody>
             </table>
-            <div class="row"  *ngIf="pagesTable">
+            <div class="row" *ngIf="pagesTable">
               <div class="col-6">
                 <div class="form-group">
                   <label style="float:right">المجموعات</label>

src/app/dashboard/report-list/report-list.component.ts

@@ -58,7 +58,7 @@ export class ReportListComponent implements OnInit {
       (params: Params) => {
         this.reportType = params['reportName'];
         if(this.reportType == 'reportPermissions') {
-          this.permissionsTable = true;
+          //this.permissionsTable = true;
         } else if(this.reportType == 'reportPages') {
           this.typeRoleReport = 'reportPages';
           this.spinner.show();
@@ -97,11 +97,12 @@ export class ReportListComponent implements OnInit {
     console.log(this.name);
     this.http.get(this.authSer.pathApi + '/find_user/' + this.name).subscribe(
       (responce) => {
-        console.log(responce);
-        if(responce['users'].length == 0) {
+        console.log('reprt data ', responce);
+        if(responce['user'] == null) {
           this.toastr.warning('لا يوجد مستخدمين بهذا الاسم');
         } else {
-          this.usersList = responce['users'];
+          this.usersList = responce['user'];
+          this.permissionsTable = true;
           console.log(this.usersList);
         }
 
@@ -120,7 +121,8 @@ export class ReportListComponent implements OnInit {
 
   //on get user  report
   onGetReport(user_id) {
-    this.router.navigate(['userreport/' + user_id]);
+    console.log(user_id);
+    this.router.navigate(['service/' + this.userLoginId + '/' + this.serviceId + '/userreport/' + user_id]);
   }
 
   getRoleReport() {

src/app/dashboard/roles/role-report/role-report.component.ts

@@ -1,3 +1,4 @@
+import { AuthServiceService } from 'src/app/shared/auth-service.service';
 import { UserService } from './../../../shared/user.service';
 import { ActivatedRoute, Params } from '@angular/router';
 import { Component, OnInit } from '@angular/core';
@@ -16,16 +17,31 @@ export class RoleReportComponent implements OnInit {
   roleId: number;
   rolesList: any [];
   selectedAll: any;
+  showRoleReport: boolean = false;
 
   constructor(private route: ActivatedRoute, 
     private dashboardSer: DashboardService, 
     private userService: UserService,
+    public authSer: AuthServiceService,
     private spinner: NgxSpinnerService ) { 
       this.spinner.show();
     }
 
   ngOnInit() {
     
+   //init values of permisions
+   this.authSer.showAddBtn = false;
+   this.authSer.showDeleteBtn = false;
+   this.authSer.showEditBtn = false;
+   this.authSer.showPermissionsBtn = false;
+    //show / hide notification search in header
+    this.authSer.notificationLogin = true;
+    this.authSer.showSearchHeader = false;
+    this.authSer.showHeaderLogin = false;
+    this.authSer.showHeaderDashBoard = true;
+    this.authSer.showDashboardHeader = true;
+    this.authSer.internalHeader = false;
+
     this.userService.getUserDataProfile();
     
     this.route.params.subscribe(
@@ -36,6 +52,7 @@ export class RoleReportComponent implements OnInit {
             //console.log(responce);
             this.rolesList = responce['role'];
             console.log('role list', this.rolesList);
+            this.showRoleReport = true;
             this.spinner.hide();
           }, 
           (error) => {

src/app/dashboard/roles/role-report2/role-report2.component.html

@@ -2,16 +2,15 @@
   <div class="container">
       <div class="containerContent-w">
           <div class="row">
-              <button class="btn btn-success" style="float:right;margin:10px 0;" (click)="onPrint()">طباعه</button>
               <div class="col-12">
                 <table class="table table-bordered text-center">
                   <thead>
                     <tr>
-                      <th>إسم المجموعه</th>
-                      <th>اسم الموظف</th>
-                      <th>اسم الاداره</th>
-                      <th>أسم الموظف مانح الصلاحيه</th>
-                      <th>تاريخ المنح</th>
+                      <th class="text-center">إسم المجموعه</th>
+                      <th class="text-center">اسم الموظف</th>
+                      <th class="text-center">اسم الاداره</th>
+                      <th class="text-center">أسم الموظف مانح الصلاحيه</th>
+                      <th class="text-center">تاريخ المنح</th>
                     </tr>
                   </thead>
                   <tbody>
@@ -40,6 +39,7 @@
                     </tr>
                   </tbody>
                 </table>
+                <button class="btn btn-success" style="float:right;margin:10px 0;" (click)="onPrint()">طباعه</button>
               </div>
             </div>
       </div>

src/app/dashboard/roles/role-report2/role-report2.component.ts

@@ -1,3 +1,4 @@
+import { AuthServiceService } from 'src/app/shared/auth-service.service';
 import { DashboardService } from './../../../shared/dashboard.service';
 import { ActivatedRoute, Params } from '@angular/router';
 import { Component, OnInit } from '@angular/core';
@@ -16,12 +17,26 @@ export class RoleReport2Component implements OnInit {
   reportData = [];
   constructor(private dashboardSer: DashboardService, 
     private route: ActivatedRoute, 
+    public authSer: AuthServiceService,
     private userService: UserService,
     private spinner: NgxSpinnerService) { 
       this.spinner.show();
     }
 
   ngOnInit() {
+     //init values of permisions
+     this.authSer.showAddBtn = false;
+     this.authSer.showDeleteBtn = false;
+     this.authSer.showEditBtn = false;
+     this.authSer.showPermissionsBtn = false;
+      //show / hide notification search in header
+      this.authSer.notificationLogin = true;
+      this.authSer.showSearchHeader = false;
+      this.authSer.showHeaderLogin = false;
+      this.authSer.showHeaderDashBoard = true;
+      this.authSer.showDashboardHeader = true;
+      this.authSer.internalHeader = false;
+
     this.userService.getUserDataProfile();
     this.route.params.subscribe(
       (params:Params) => {

src/app/dashboard/sections/add-section/add-section.component.html

@@ -22,19 +22,19 @@
                 <div class="col-12 col-sm-6 col-md-4 col-lg-4">
                   <div class="form-group">
                     <label for="email">الأيميل <span class="spanReqired-w">*</span></label>
-                    <input type="email" class="form-control" name="email" placeholder="الإيميل" ngModel email #email="ngModel" [ngModel]="section.email" required/>
+                    <input type="email" class="form-control" name="email" placeholder="الإيميل" appEnglishCharacters ngModel email #email="ngModel" [ngModel]="section.email" required/>
                     <span class="help-block" *ngIf="!email.valid && email.touched" style="color:red">من فضلك أدخل إيميل صحيح</span>
                   </div>
                 </div>
                 <div class="col-12 col-sm-6 col-md-4 col-lg-4">
                   <div class="form-group">
-                    <label for="phone">رقم الجوال</label>
+                    <label for="phone">رقم الهاتف</label>
                     <input type="phone" appNumberDerictive class="form-control" placeholder="الهاتف" name="phone" ngModel #phone="ngModel" [ngModel]="section.phone"/>
                   </div>
                 </div>
                 <div class="col-12 col-sm-6 col-md-4 col-lg-4">
                   <div class="form-group">
-                    <label for="switch_phone">رقم الجوال البديل</label>
+                    <label for="switch_phone">رقم التحويله</label>
                     <input type="phone" appNumberDerictive class="form-control" placeholder="الهاتف البديل" name="switch_phone" ngModel #switchPhone="ngModel" [ngModel]="section.switch_phone"/>
                   </div>
                 </div>

src/app/dashboard/statistics/add-statistic/add-statistic.component.html

@@ -20,13 +20,13 @@
 
               <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                 <div class="form-group">
-                  <label for="name" style="float: right; margin-right: 5px"> الإسم باللغه العربيه <span class="spanReqired-w">*</span></label>
+                  <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" ngModel [ngModel]="statistic.name" #name="ngModel" required/>
                 </div>
               </div>
               <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                 <div class="form-group">
-                  <label for="name" style="float: right; margin-right: 5px"> الإسم باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
+                  <label for="name" style="float: right; margin-right: 5px"> إسم الإحصائيه باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
                   <input type="text" class="form-control" id="name_en" name="name_en" ngModel [ngModel]="statistic.name_en" #name="ngModel" required/>
                 </div>
               </div>
@@ -40,21 +40,19 @@
 
               <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                 <div class="form-group">
-                  <label style="float:right">الشهر <span class="spanReqired-w">*</span></label>
-                  <!-- <select class="form-control"  ngModel [ngModel]="statistic.month_id">
-                    <option value="1">فعال</option>
-                    <option value="0">غير فعال</option>
+                  <label style="float:right" for="month_id">الشهر <span class="spanReqired-w">*</span></label>
+                  <select class="form-control" name="month_id" id="month_id" ngModel [ngModel]="statistic.month_id" required>
                     <option *ngFor="let month of months; let i = index" [value]="month.id">{{month.name}}</option>
-                  </select> -->
-                  <input type="text" class="form-control" id="month_id" name="month_id" ngModel [ngModel]="statistic.month_id" #name="ngModel" required/>
-
+                  </select>
                 </div>
               </div>
 
               <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                 <div class="form-group">
-                  <label for="name" style="float: right; margin-right: 5px"> السنة<span class="spanReqired-w">*</span></label>
-                  <input type="number" class="form-control" placeholder="2019"  min="1950" max="2099" step="1"  id="year" name="year" ngModel [ngModel]="statistic.year" #name="ngModel" required/>
+                  <label for="year" style="float: right; margin-right: 5px"> السنة<span class="spanReqired-w">*</span></label>
+                  <select class="form-control" name="year" id="year" ngModel [ngModel]="statistic.year" required>
+                      <option *ngFor="let year of years; let i = index" [value]="year.id">{{year.value}}</option>
+                    </select>
                 </div>
               </div>
 

src/app/dashboard/statistics/add-statistic/add-statistic.component.ts

@@ -26,6 +26,7 @@ export class AddStatisticComponent implements OnInit {
     private route:ActivatedRoute) { }
 
     months = [];
+    years = [];
     typeMode:boolean = false; //default false for create page
     typeLink: string;
     statisticId:number;
@@ -48,12 +49,23 @@ export class AddStatisticComponent implements OnInit {
         (responce) => {
           console.log(responce);
           this.months = responce['months'];
+          console.log('months ', this.months);
         },
         (error) => {
           console.log(error)
         }
       );
 
+      this.userSer.getYear().subscribe(
+        (response) => {
+          console.log('yeaaaaaaaaars', this.years);
+          this.years = response['years'];
+        },
+        (error) => {
+          console.log(error);
+        }
+      )
+
       this.route.params.subscribe(
         (params: Params) => {
           console.log(params)

src/app/dashboard/tabs/add-tab/add-tab.component.css

@@ -31,4 +31,24 @@ input[type="file"] {
     background-color: #f9f9f9;
     border: 2px solid #bda380;
     
+}
+
+.iconUpload-w {
+    width: 100%;
+    border: 2px solid #bda380;
+    margin-top: 30px;
+    /* padding: 5px 0; */
+    border-radius: 5px;
+    background-color: #f9f9f9;
+    padding: 4px 0;
+    cursor: pointer;
+    /* margin: 2px 0; */
+}
+
+
+.fileName-w {
+    color: green;
+    position: absolute;
+    top: 35px;
+    left: 30px;
 }

src/app/dashboard/tabs/add-tab/add-tab.component.html

@@ -65,10 +65,18 @@
               </select>
             </div>
 
-            <div class="col-12 col-sm-12 col-md-4" style="margin-bottom:30px">
+            <!-- <div class="col-12 col-sm-12 col-md-4" style="margin-bottom:30px">
                 <div class="form-group text-center imgContainer">
                   <button class="btn btn-default" *ngIf="checkShowDownloadFile" type="button" style="position: absolute; background:transparent; border:none; left:17px; top:32px"> <a href="{{authSer.pathImg + tab.file}}"><i class="fas fa-download"></i></a></button>
                 </div>
+            </div> -->
+            
+            <div class="col-12 col-sm-12 col-md-4">
+              <div class="form-group">
+                <input type="file" name="file" id="file" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event)"/>
+                <label for="file" class="iconUpload-w"><i class="fas fa-upload"></i></label>
+                <span class="fileName-w" *ngIf="nameLink" style="color:green"> <i class='fa fa-check'style=" float: left; padding-top: 4px; "></i></span>
+              </div>
             </div>
 
             <div class="col-6">

src/app/dashboard/tabs/add-tab/add-tab.component.ts

@@ -74,7 +74,7 @@ export class AddTabComponent implements OnInit {
               this.tab.type = tabData.type;
               this.tab.status = tabData.status;
               this.tab.file = tabData.file;
-              responce['tab'].file ? this.checkShowDownloadFile = true : this.checkShowDownloadFile = false;
+              responce['tab'].file ? this.nameLink = responce['tab'].file : '';
               this.spineer.hide();
             },
             (error) => {
@@ -167,19 +167,25 @@ export class AddTabComponent implements OnInit {
       }
      
     } else {
-      this.dashboardSer.addItem(this.formTabData.value, 'tab').subscribe(
-        (responce) => {
-          console.log(responce);
-          this.toastr.success('تم الاضافه بنجاح');
-          this.location.back();
-          this.checkSaveclick = false;
-        },
-        (error) => {
-          console.log(error);
-          this.toastr.error('خطأ في الأضافه ');
-          this.checkSaveclick = false;
-        }
-      );
+      if(this.formTabData.value.file) {
+        this.dashboardSer.addItem(this.formTabData.value, 'tab').subscribe(
+          (responce) => {
+            console.log(responce);
+            this.toastr.success('تم الاضافه بنجاح');
+            this.location.back();
+            this.checkSaveclick = false;
+          },
+          (error) => {
+            console.log(error);
+            this.toastr.error('خطأ في الأضافه ');
+            this.checkSaveclick = false;
+          }
+        );
+      } else {
+        this.toastr.warning('قم بإضافه ملف !');
+        this.checkSaveclick = false;
+      }
+      
     }
     
   };

src/app/dashboard/tabs/tab-list/tab-list.component.ts

@@ -42,16 +42,18 @@ export class TabListComponent implements OnInit {
   ngOnInit() {
 
     this.spinner.show();
-    //init the values of permision boolean
-    this.authSer.showAddBtn = false;
-    this.authSer.showDeleteBtn = false;
-    this.authSer.showEditBtn = false;
-    //show / hide notification search in header
-    this.authSer.notificationLogin = true;
-    this.authSer.showSearchHeader = false;
-    this.authSer.showHeaderLogin = false;
-    this.authSer.showHeaderDashBoard = true;
-    this.authSer.internalHeader = false;
+     //init values of permisions
+     this.authSer.showAddBtn = false;
+     this.authSer.showDeleteBtn = false;
+     this.authSer.showEditBtn = false;
+     this.authSer.showPermissionsBtn = false;
+      //show / hide notification search in header
+      this.authSer.notificationLogin = true;
+      this.authSer.showSearchHeader = false;
+      this.authSer.showHeaderLogin = false;
+      this.authSer.showHeaderDashBoard = true;
+      this.authSer.showDashboardHeader = true;
+      this.authSer.internalHeader = false;
 
     this.route.params.subscribe(
       (params: Params) => {

src/app/dashboard/users/form-user/form-user.component.html

@@ -203,7 +203,7 @@
             <div class="col-12 col-sm-12 col-md-6 col-lg-4" *ngIf="signupForm.controls.type.value == '0' ">
               <div class="form-group">
                 <label style="float:right">الاداره <span class="spanReqired-w">*</span></label>
-                <select class="form-control" (change)="getDepartment()" formControlName="adminstration_id" [ngModel]="adminstrationsVal">
+                <select class="form-control" (change)="getDepartment()" formControlName="adminstration_id">
                   <option>أختر إداره</option>
                   <option *ngFor="let admin of adminstration; let i = index" [value]="admin.id">{{admin.name}}</option>
                 </select>

src/app/dashboard/users/users.component.html

@@ -48,14 +48,12 @@
               <th>
                 <div class="custom-control custom-checkbox">
                     <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
-                    <!-- <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px; cursor:pointer"></label> -->
                 </div>
               </th>
               <th>الاسم</th>
               <th *ngIf="checkListType">البريد الإلكتروني</th>
               <th *ngIf="authSer.showEditBtn">تعديل</th>
               <th *ngIf="authSer.showPermissionsBtn">الصلاحيات</th>
-              <!-- <th *ngIf="authSer.showReport">التقارير</th> -->
             </tr>
           </thead>
           <tbody>
@@ -63,14 +61,12 @@
               <td>
                 <div class="custom-control custom-checkbox centerIneerItem">
                   <input type="checkbox" class="custom-control-input" id="{{user.id}}" [(ngModel)]="user.selected" [value]='user' (change)="checkIfAllSelected()">
-                  <!-- <label class="custom-control-label disblayBlock-w" for="{{user.id}}" style="color:#2a2a2a; cursor:pointer"></label> -->
                 </div>
               </td>
               <td>{{user.name}}</td>
               <td *ngIf="checkListType">{{user.email}}</td>
-              <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(user.id)"><i class="fas fa-edit"></i></button></td>
-              <td *ngIf="authSer.showPermissionsBtn"><button type="button" class="btn btn-outline-secondary" (click)="onGetPermission(user.id)"><i class="fas fa-hand-paper"></i></button></td>
-              <!-- <td *ngIf="authSer.showReport"><button class="btn btn-outline-secondary" (click)="onGetReport(user.id)"><i class="fas fa-address-card"></i></button></td> -->
+              <td *ngIf="authSer.showEditBtn" (click)="onEdit(user.id)" style="cursor: pointer;"><button type="button" class="btn btn-outline-secondary"><i class="fas fa-edit"></i></button></td>
+              <td *ngIf="authSer.showPermissionsBtn" (click)="onGetPermission(user.id)" style="cursor: pointer;"><button type="button" class="btn btn-outline-secondary"><i class="fas fa-hand-paper"></i></button></td>
             </tr>
           </tbody>
         </table>

src/app/dashboard/visiting-times/visiting-times-list/visiting-times-list.component.ts

@@ -249,7 +249,6 @@ export class VisitingTimesListComponent implements OnInit {
 
     //edit function
     onEdit(editTabID) {
-    alert(editTabID)
     localStorage.setItem('editvisitingTimeIdStorage', editTabID);
     this.router.navigate(['service/' + this.userLoginId + '/' + this.serviceId + '/visitingTime/edit/'+ editTabID]);
     console.log('service/' + this.userLoginId + '/' + this.serviceId + '/visitingTime/edit/'+ editTabID);

src/app/shared/auth-service.service.ts

@@ -50,10 +50,11 @@ export class AuthServiceService {
   showArabicIcon:boolean;
   showEnglishIcon:boolean;
 
-  // pathApi: string = 'http://10.93.50.2/kfmc_back_end/index.php/api';
-  // pathImg: string = "http://10.93.50.2/kfmc_back_end/public/";
-  pathApi: string = 'http://kfmc.info/back_end/api';
-  pathImg: string = "http://kfmc.info/back_end/public/";
+  pathApi: string = 'http://10.93.50.2/kfmc_back_end/index.php/api';
+  pathImg: string = "http://10.93.50.2/kfmc_back_end/public/";
+
+  // pathApi: string = 'http://kfmc.info/back_end/api';
+  // pathImg: string = "http://kfmc.info/back_end/public/";
   
   myInnerHeight = window.innerHeight;
   imgSrc: string =  '../../assets/image/avatar.png'; //page profile default

src/app/shared/dashboard.service.ts

@@ -218,7 +218,7 @@ export class DashboardService {
       } else if(editPageName == 'lecture') {
         return this.http.post(this.authService.pathApi + '/edit_lecture', editData);
       } else if(editPageName == 'internalSer'){
-        return this.http.post(this.authService.pathApi + '/', editData);
+        return this.http.post(this.authService.pathApi + '/edit_internal_service', editData);
       } else if(editPageName == 'internalHospital') {
         return this.http.post(this.authService.pathApi + '/edit_hospitals_centers', editData);
       } else if(editPageName == 'externalHospital') {

src/app/shared/user.service.ts

@@ -49,6 +49,12 @@ export class UserService {
     return this.http.get(this.authService.pathApi + '/months_list');
   }
 
+  //get month
+  getYear(){
+    return this.http.get(this.authService.pathApi + '/years_list');
+  }
+
+    
   //get departments
   getDepartments(adminstrationId) {
     return this.http.get(this.authService.pathApi + '/admin_departments/' + adminstrationId);