24 gohari edits

src/app/dashboard/advertising-services/add-advertising-service/add-advertising-service.component.html

@@ -40,7 +40,7 @@
               </div>
 
               <div class="col-12 col-sm-12 col-md-4">
-                <label for="position" style="float: right; margin-right: 5px">صف العرض <span class="spanReqired-w">*</span></label>
+                <label for="position" style="float: right; margin-right: 5px">مكان الإعلان <span class="spanReqired-w">*</span></label>
                 <select class="form-control" name="position" ngModel [ngModel]="advertising.position" id="position" required>
                   <option value="first_row">الصف الأول</option>
                   <option value="second_row">الصف الثاني </option>
@@ -48,7 +48,7 @@
               </div>
 
               <div class="col-12 col-sm-12 col-md-4">
-                <label for="type" style="float: right; margin-right: 5px">نوع الخدمة <span class="spanReqired-w">*</span></label>
+                <label for="type" style="float: right; margin-right: 5px">نوع محتوي الإعلان <span class="spanReqired-w">*</span></label>
                 <select class="form-control" name="type" ngModel [ngModel]="advertising.type" id="type" required>
                   <option value="link">رابط</option>
                   <option value="content">محتوي </option>
@@ -58,7 +58,7 @@
 
               <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                 <div class="form-group">
-                  <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>
                   <input type="text" class="form-control" id="link" name="link" ngModel [ngModel]="advertising.link" #name="ngModel" />
                 </div>
               </div>

src/app/dashboard/advertising-services/advertising-services-list/advertising-services-list.component.html

@@ -52,8 +52,8 @@
               <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px; cursor: pointer;"></label>
             </div>
           </th>
-          <th>إسم الإعلان</th>
-          <th>صف العرض</th>
+          <th>عنوان الإعلان</th>
+          <th>مكان الإعلان</th>
           <th>الحالة</th>
           <th *ngIf="authSer.showEditBtn">تعديل</th>
         </tr>

src/app/dashboard/external-achievements/external-achievements-list/external-achievements-list.component.html

@@ -52,7 +52,7 @@
               <label class="custom-control-label fixedWidthLabel-w checkAll-w" for="customCheck" style="margin-bottom:20px; cursor: pointer;"></label>
             </div>
           </th>
-          <th>عنوان الإنجاز</th>
+          <th>اسم الإنجاز</th>
           <th>تاريخ الإنجاز</th>
           <th>الترتيب</th>
           <th>الحالة</th>

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

@@ -1,6 +1,6 @@
 <div class="addHospital-w">
   <div class="container">
-    
+
     <div class="row">
       <div class="col-12">
         <ul class="list-unstyled titileLi-w">
@@ -10,12 +10,12 @@
         </ul>
       </div>
     </div>
-    
+
     <div class="containerContent-w">
         <div class="row">
             <div class="col-12">
               <form (ngSubmit)="onSubmitted()" [formGroup]="addHospitalForm">
-                
+
                 <div class="row">
                   <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                       <div class="form-group">
@@ -40,14 +40,15 @@
                       <select class="form-control" formControlName="display_location" id="displayLocation">
                         <option value="internal">داخليه</option>
                         <option value="external">خارجيه</option>
+                        <option value="both">كلاهما</option>
                       </select>
                     </div>
                   </div>
                 </div>
-              
+
                 <div formArrayName="fields" *ngFor="let titleControl of addHospitalForm.get('fields').controls; let i = index" style="padding: 20px 0;">
                   <div class="form-group  arrayGroupForm-w" [formGroupName]="i">
-                   
+
                     <div class="row">
                         <div class="col-12 col-md-6">
                             <div class="form-group">
@@ -55,17 +56,17 @@
                                 <input type="text" id="title" class="form-control" formControlName="title" style="margin: 10px 0;" />
                             </div>
                         </div>
-                        
-          
+
+
                         <div class="col-12 col-md-6">
                             <div class="form-group">
                                 <label for="title_en" style="float: right;">العنوان باللغه الإنجليزيه</label>
                                 <input type="text" id="title_en" class="form-control" formControlName="title_en" style="margin: 10px 0;" />
                             </div>
                         </div>
-                      
-                
-                
+
+
+
                       <div class="col-12">
                           <div class="form-group">
                             <label id="description" style="float: right; margin: 10px 5px"> الوصف باللغه العربيه</label>
@@ -73,8 +74,8 @@
                             </quill-editor>
                           </div>
                       </div>
-                        
-          
+
+
                       <div class="col-12">
                         <div class="form-group">
                           <label id="description_en" style="float: right; margin: 10px 5px">الوصف باللغه الإنجليزيه</label>
@@ -86,17 +87,17 @@
                       <div class="col-12">
                         <button type="button" class="btn btn-danger rightW" (click)="removeTitle(i)" *ngIf="i == 0 ? false : true">حذف</button>
                       </div>
-      
+
                     </div>
                   </div>
                 </div>
 
                 <button type="submit" class="btn btn-success rightW" [disabled]="!addHospitalForm.valid || checkSaveClick">حفظ</button>
                 <button type="button" class="btn btn-warning rightW" (click)="authSer.backFromEdit()" style="margin: 33px 10px;">إلغاء</button>
-                
+
               </form>
             </div>
         </div>
     </div>
   </div>
-</div>
+</div>

src/app/dashboard/visiting-times/add-visiting-time/add-visiting-time.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]="visitingTime.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_en" style="float: right; margin-right: 5px">العنوان باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
+                  <label for="name_en" 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]="visitingTime.name_en" #name="ngModel" required/>
                 </div>
               </div>
@@ -40,12 +40,12 @@
               </div>
 
               <div class="col-12 col-sm-12 col-md-4" >
-                <label for="event_time" style="float: right;margin-right: 5px"> موعد البدء <span class="spanReqired-w">*</span></label>
+                <label for="event_time" style="float: right;margin-right: 5px">وقت بداية الزيارة <span class="spanReqired-w">*</span></label>
                 <input  class="form-control" type="time" name="open_time" ngModel [ngModel]="visitingTime.open_time">
               </div>
 
               <div class="col-12 col-sm-12 col-md-4" >
-                <label for="event_time" style="float: right;margin-right: 5px"> موعد الانتهاء <span class="spanReqired-w">*</span></label>
+                <label for="event_time" style="float: right;margin-right: 5px"> وقت نهاية الزيارة <span class="spanReqired-w">*</span></label>
                 <input  class="form-control" type="time" name="close_time" ngModel [ngModel]="visitingTime.close_time">
               </div>
 

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

@@ -4,7 +4,7 @@
     <div class="col-12">
       <ul class="list-unstyled titileLi-w">
         <li class="headingText-w">خدمة إدارة الصفحة الخارجية </li>
-        <li class="headingText-w activeLi-w" style="margin-right:5px">إدارة مواعيد الزيارات </li>
+        <li class="headingText-w activeLi-w" style="margin-right:5px">إدارة مواعيد الزيارة </li>
       </ul>
     </div>
   </div>
@@ -53,8 +53,8 @@
             </div>
           </th>
           <th>الإسم</th>
-          <th>موعد بدء العمل</th>
-          <th>موعد انتهاء العمل</th>
+          <th>وقت بداية الزيارة</th>
+          <th>وقت نهاية الزيارة</th>
           <th>الحالة</th>
           <th *ngIf="authSer.showEditBtn">تعديل</th>
         </tr>

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

@@ -247,7 +247,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);