for style

src/app/External-Page/external-hospital/external-hospital.component.ts

@@ -31,16 +31,15 @@ export class ExternalHospitalComponent implements OnInit {
   ngOnInit() {
     
     this.authSer.homeActivate = false;
-    //catch params type from URL
-    this.route.params.subscribe(
-      (params:Params) => {
-        this.typePage = params['type_page'];
-      }
-    );
+    // //catch params type from URL
+    // this.route.params.subscribe(
+    //   (params:Params) => {
+    //     this.typePage = params['type_page'];
+    //   }
+    // );
 
 
     //get hospital or managaments data 
-    if(this.typePage == 'hospital') {
 
       //to add class active if hospital route activate
       this.externalService.getHospitalMangamentsData('hospital').subscribe(
@@ -72,46 +71,10 @@ export class ExternalHospitalComponent implements OnInit {
           console.log(error);
         }
       );
-
-    } else if(this.typePage == 'managements') {
-      
-      //to add class active if mangaments route activate
-      this.externalService.getHeader().subscribe(
-        (responce) => {
-          this.externalService.headerMenus = responce['parents'];
-          for(let i = 0; i < this.externalService.headerMenus.length; i++) {
-            if(this.externalService.headerMenus[i].id == 20) {
-              this.externalService.headerMenus[i].active = 1;
-            } else {
-              this.externalService.headerMenus[i].active = 0;
-            }
-          }
-          this.spinner.hide();
-        },
-        (error) => {
-          console.log(error);
-        }
-      );
-
-      this.externalService.getHospitalMangamentsData('managements').subscribe(
-        (responce) => {
-          console.log(responce);
-          this.data = responce['managements'];
-          console.log('data mangaments', this.data);
-          this.showDescriptionDetails(this.data[0].fields[0]);
-          this.spinner.hide();
-        },
-        (error) => {
-          console.log(error);
-        }
-      )
-    }
-
-
   }
 
-  //show data of filed if click
-  showDescriptionDetails(fieldData) {
+   //show data of filed if click
+   showDescriptionDetails(fieldData) {
     console.log(fieldData);
     this.detailsField = {
       title: fieldData.title,
@@ -119,8 +82,7 @@ export class ExternalHospitalComponent implements OnInit {
       description: fieldData.description,
       description_en: fieldData.description_en,
     }
-
     console.log(this.detailsField);
   }
-
+  
 }

src/app/External-Page/external-managaments/external-managaments.component.css

@@ -0,0 +1,76 @@
+.hospitalContent-w .card-header {
+    background-color: #00a99d !important;
+    cursor: initial;
+}
+
+.hospitalContent-w .card-header button {
+    cursor: pointer;
+}
+
+.hospitalContent-w .card-body ul li{
+    cursor: pointer;
+    color: #888;
+    transition: all 0.5s;
+}
+
+
+
+.hospitalContent-w .card-body ul li:hover {
+    color: #00a99d;
+}
+
+.containerContent-w {
+    border-top: 5px solid #00a99d;
+}
+
+.hospitalContent-w .containerContent-w .information h2 {
+    color: #74c5bf;
+}
+
+.hospitalContent-w .containerContent-w .information p {
+    color: #bdb9b9;
+}
+
+.achievementsLang-w h2 {
+    color: #74c5bf;
+}
+
+.achievementsLang-w p {
+    color: #bdb9b9;
+}
+
+.testBody-w {
+    background-color: #f3f3f3;
+}
+
+@media(max-width: 767px) {
+    .hospitalContent-w .card-body ul li {
+        font-size: 13px;
+        padding: 5px 0;
+    }
+
+    .hospitalContent-w .containerContent-w .information {
+        margin: 10px 0;
+    }
+
+    .hospitalContent-w .containerContent-w .information h2 {
+        color: #74c5bf;
+        font-size: 20px;
+    }
+    
+    .hospitalContent-w .containerContent-w .information p {
+        color: #bdb9b9;
+        font-size: 17px;
+    }
+
+}
+@media screen and (min-width: 1200px) {
+    .container {
+        max-width: 1200px !important;
+    }
+
+}
+
+
+
+

src/app/External-Page/external-managaments/external-managaments.component.html

@@ -0,0 +1,81 @@
+<div class="hospitalContent-w">
+    <div class="container">
+      <div class="row">
+          <div class="containerContent-w">
+              <ng-template [ngIf]="authSer.arabicTemplate" [ngIfElse]="englishTemplate">
+                <div class="row">
+                    <div class="col-12 col-md-3">
+                        <div class="recordsContent-w">
+                            <div id="accordion">
+                              <div class="card" *ngFor="let item of data; let i = index">
+                                <div class="card-header" [attr.id]="'heading'+(i+1)">
+                                    <button class="btn btn-link" data-toggle="collapse" [attr.data-target]="'#collapse'+(i+1)" [attr.aria-expanded]="(i+1)==1 ? true :false" [attr.aria-controls]="'collapse'+(i+1)">
+                                      <h4 class="panel-title">{{item.name}}</h4>
+                                    </button>
+                                </div>
+                            
+                                <div *ngFor="let field of item['fields']" [attr.id]="'collapse'+(i+1)" class="collapse" [ngClass]="{'show' : (i+1) == 1}" [attr.aria-labelledby]="'heading' + (i+1)" data-parent="#accordion">
+                                  <div class="card-body testBody-w">
+                                      <ul class="list-unstyled">
+                                        <li (click)="showDescriptionDetails(field)"  [className]=" authSer.arabicTemplate ? '' : 'achievementsLangHeading-w' " style="text-align:right;margin-right:-23px">
+                                            {{field.title}}
+                                        </li>
+                                      </ul>
+                                  </div>
+                                </div>
+                              </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-md-9">
+                      <div class="information">
+                        <h2>{{detailsField.title}}</h2>
+                        <p [innerHTML]="detailsField.description"></p>
+                      </div>
+                    </div>
+                </div>
+              </ng-template>
+  
+              <ng-template #englishTemplate>
+                <div class="container" style="direction:ltr">
+                  <div class="row">
+                      <div class="col-12 col-md-3">
+                          <div class="recordsContent-w">
+                              <div id="accordion">
+                                  <div class="card" *ngFor="let item of data; let i = index">
+                                      <div class="card-header" [attr.id]="'heading'+(i+1)">
+                                      <h5 class="mb-0">
+                                          <button class="btn btn-link" data-toggle="collapse" [attr.data-target]="'#collapse'+(i+1)" [attr.aria-expanded]="(i+1)==1 ? true :false" [attr.aria-controls]="'collapse'+(i+1)">
+                                          <h4 class="panel-title">{{item.name_en}}</h4>
+                                          </button>
+                                      </h5>
+                                      </div>
+                                  
+                                      <div *ngFor="let field of item['fields']" [attr.id]="'collapse'+(i+1)" class="collapse" [ngClass]="{'show' : (i+1) == 1}" [attr.aria-labelledby]="'heading' + (i+1)" data-parent="#accordion">
+                                      <div class="card-body testBody-w">
+                                          <ul class="list-unstyled nestedMenu">
+                                              <li (click)="showDescriptionDetails(field)" [className]=" authSer.arabicTemplate ? '' : 'achievementsLangHeading-w' " style="text-align:left; margin-left:10px;">
+                                                  {{field.title_en}}
+                                              </li>
+                                          </ul>
+                                      </div>
+                                      </div>
+                                  </div>
+                              </div>
+                          </div>
+                      </div>
+                      <div class="col-12 col-md-9">
+                        <div class="information" [className]=" authSer.arabicTemplate ? '' : 'achievementsLang-w' ">
+                          <h2>{{detailsField.title_en}}</h2>
+                          <p [innerHTML]="detailsField.description_en"></p>
+                        </div>
+                      </div>
+                  </div>
+                </div>
+              </ng-template>
+  
+          </div>
+      </div>
+    </div>
+  </div>
+  

src/app/External-Page/external-managaments/external-managaments.component.ts

@@ -0,0 +1,76 @@
+import { NgxSpinnerService } from 'ngx-spinner';
+import { AuthServiceService } from './../../shared/auth-service.service';
+import { ActivatedRoute } from '@angular/router';
+import { Component, OnInit } from '@angular/core';
+import { ExternalPageService } from '../../shared/external-page.service';
+
+@Component({
+  selector: 'app-external-managaments',
+  templateUrl: './external-managaments.component.html',
+  styleUrls: ['./external-managaments.component.css']
+})
+export class ExternalManagamentsComponent implements OnInit {
+
+  typePage: string = '';
+  data = [];
+  detailsField = {
+    title_en: '',
+    title: '',
+    description: '',
+    description_en: '',
+  }
+
+  constructor(private route: ActivatedRoute,
+    private authSer: AuthServiceService, 
+    private spinner: NgxSpinnerService,
+    private externalService: ExternalPageService) {
+      this.spinner.show();
+     }
+
+  ngOnInit() {
+    this.authSer.homeActivate = false;
+    //to add class active if mangaments route activate
+    this.externalService.getHeader().subscribe(
+      (responce) => {
+        this.externalService.headerMenus = responce['parents'];
+        for(let i = 0; i < this.externalService.headerMenus.length; i++) {
+          if(this.externalService.headerMenus[i].id == 20) {
+            this.externalService.headerMenus[i].active = 1;
+          } else {
+            this.externalService.headerMenus[i].active = 0;
+          }
+        }
+        this.spinner.hide();
+      },
+      (error) => {
+        console.log(error);
+      }
+    );
+
+    this.externalService.getHospitalMangamentsData('managements').subscribe(
+      (responce) => {
+        console.log(responce);
+        this.data = responce['managements'];
+        console.log('data mangaments', this.data);
+        this.showDescriptionDetails(this.data[0].fields[0]);
+        this.spinner.hide();
+      },
+      (error) => {
+        console.log(error);
+      }
+    );
+  }
+
+   //show data of filed if click
+   showDescriptionDetails(fieldData) {
+    console.log(fieldData);
+    this.detailsField = {
+      title: fieldData.title,
+      title_en: fieldData.title_en,
+      description: fieldData.description,
+      description_en: fieldData.description_en,
+    }
+    console.log(this.detailsField);
+  }
+
+}

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

@@ -3,44 +3,44 @@
         <div class="container">
             <div class="row">
                 <div class="col-5 col-sm-5 col-md-4 col-lg-4"  style="margin:0;padding:0">
-                        <div class="notificationDiv-w">
-                            <ul class="list-unstyled notificationList-w" *ngIf="!authSer.isAuthenticated()">
-                                <li class="profileData-w">
-                                    <div class="dropdown">
-                                        <button class="btn dropdown-toggle buttonW" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            <img src="{{authSer.dataLoginUser['photo'] ? authSer.pathImg + authSer.dataLoginUser['photo'] : authSer.imgSrc}}" title="imageProfile" alt="" />
-                                            {{ authSer.dataLoginUser['name'] }} 
+                    <div class="notificationDiv-w">
+                        <ul class="list-unstyled notificationList-w" *ngIf="!authSer.isAuthenticated()">
+                            <li class="profileData-w">
+                                <div class="dropdown">
+                                    <button class="btn dropdown-toggle buttonW" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                        <img src="{{authSer.dataLoginUser['photo'] ? authSer.pathImg + authSer.dataLoginUser['photo'] : authSer.imgSrc}}" title="imageProfile" alt="" />
+                                        {{ authSer.dataLoginUser['name'] }} 
+                                    </button>
+                                    <div class="dropdown-menu" style="text-align:right" aria-labelledby="dropdownMenuButton"> 
+                                        <button class="dropdown-item" style="cursor: pointer;" >
+                                        <i class="fas fa-bell"></i>
+                                        <span>الاشعارات</span>
                                         </button>
-                                        <div class="dropdown-menu" style="text-align:right" aria-labelledby="dropdownMenuButton"> 
-                                            <button class="dropdown-item" style="cursor: pointer;" >
-                                            <i class="fas fa-bell"></i>
-                                            <span>الاشعارات</span>
-                                            </button>
-                                            <button class="dropdown-item" style="cursor: pointer;" (click)="onGetProfile()">
-                                                <i class="fas fa-user-alt"></i>
-                                                <span>ملفي</span>
-                                            </button>
-                                            <button class="dropdown-item" style="cursor: pointer;" >
-                                            <i class="fas fa-sticky-note"></i>
-                                            <span>ملاحظاتي</span>
-                                            </button>
-                                            <button class="dropdown-item" style="cursor: pointer;" >
-                                            <i class="fas fa-tasks"></i>
-                                            <span>مهامي</span>
-                                            </button>
-                                            <button class="dropdown-item" style="cursor: pointer;" (click)="onDashBoard()">
-                                                <i class="fas fa-solar-panel"></i>
-                                                <span>لوحة التحكم</span>
-                                            </button>
-                                            <button class="dropdown-item" style="cursor: pointer;color: #da0b0b !important;background-color: #f3f3f3;border-radius: 4px;" (click)="onLogout()">
-                                                <i class="fas fa-sign-out-alt" style="color: #da0b0b !important;"></i>
-                                                <span>خروج</span>
-                                            </button>
-                                        </div>
-                                    </div>   
-                                </li>
-                            </ul>
-                        </div>
+                                        <button class="dropdown-item" style="cursor: pointer;" (click)="onGetProfile()">
+                                            <i class="fas fa-user-alt"></i>
+                                            <span>ملفي</span>
+                                        </button>
+                                        <button class="dropdown-item" style="cursor: pointer;" >
+                                        <i class="fas fa-sticky-note"></i>
+                                        <span>ملاحظاتي</span>
+                                        </button>
+                                        <button class="dropdown-item" style="cursor: pointer;" >
+                                        <i class="fas fa-tasks"></i>
+                                        <span>مهامي</span>
+                                        </button>
+                                        <button class="dropdown-item" style="cursor: pointer;" (click)="onDashBoard()">
+                                            <i class="fas fa-solar-panel"></i>
+                                            <span>لوحة التحكم</span>
+                                        </button>
+                                        <button class="dropdown-item" style="cursor: pointer;color: #da0b0b !important;background-color: #f3f3f3;border-radius: 4px;" (click)="onLogout()">
+                                            <i class="fas fa-sign-out-alt" style="color: #da0b0b !important;"></i>
+                                            <span>خروج</span>
+                                        </button>
+                                    </div>
+                                </div>   
+                            </li>
+                        </ul>
+                    </div>
                     <p *ngIf="authSer.isAuthenticated()" class="login"><a (click)="onLogin()">تسجيل دخول </a></p>
                 </div>
                 <div class="col-5 col-sm-5 col-md-4 col-lg-4 backgroundXS">
@@ -112,7 +112,6 @@
                                         <a class="dropdown-item" href="{{child.link}}" *ngFor="let child of menu['childs']">{{child.name}}</a>
                                     </div>
                                 </li>
-
                             </ul>
                         </div>
 

src/app/External-Page/external-page.module.ts

@@ -1,3 +1,4 @@
+import { ExternalManagamentsComponent } from './external-managaments/external-managaments.component';
 import { SharedModule } from './../shared/shared.module';
 import { ExternalEventsComponent } from './external-events/external-events.component';
 import { ExternalPageService } from './../shared/external-page.service';
@@ -33,6 +34,7 @@ import { MoreNewsComponent } from './more-news/more-news.component';
         NewPageComponent,
         ExternalEventsTableComponent,
         MoreNewsComponent,
+        ExternalManagamentsComponent,
         //CeiboShare,
     ],
     imports: [

src/app/External-Page/external-routing-module.ts

@@ -7,6 +7,7 @@ import { ExternalPageComponent } from './external-page/external-page.component';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { MoreNewsComponent } from './more-news/more-news.component';
+import { ExternalManagamentsComponent } from './external-managaments/external-managaments.component';
 
 
 
@@ -17,7 +18,8 @@ const externalPageRoutes: Routes = [
         {path: 'EventsTable', component: ExternalEventsTableComponent},
         {path: 'moreNews', component: MoreNewsComponent},
         {path: 'newPage/:reportId', component: NewPageComponent},
-        {path: ':type_page', component: ExternalHospitalComponent},
+        {path: 'hospital', component: ExternalHospitalComponent},
+        {path: 'managements', component: ExternalManagamentsComponent},
     ]},
 ];
 

src/app/External-Page/more-news/more-news.component.css

@@ -55,52 +55,60 @@
     font-size: 20px;
     color: #888;
 }
+
 .inside_links{
-	    width: 100%;
+    width: 100%;
     overflow: hidden;
+    margin-top: 70px;
+    display: block;
 }
 
-.inside_links ul {
-      display: block;
+.inside_links ul{
+  display: block;
     width: 100%;
     padding: 0px;
 }
 
-.inside_links ul li {
-display: block;
+.inside_links ul li{
+    display: block;
     width: 100%;
     height: 65px;
 }
 
-.inside_links ul li span {
+.inside_links ul li span{
     display: block;
     float: right;
     margin: 1px 4px 0px 0px;
 }
-
-.inside_links ul li a img {
-      display: block;
-    width: 30px;
-    float: right;
-    height: 30px;
-    margin: 15px 10px 0px 10px;
-    filter: invert(65%);
+.eninside_links ul li span{
+ float: left !important;
+}
+.eninside_links ul li a img{
+ float: left !important;
+}
+.inside_links ul li a img{
+  display: block;
+width: 30px;
+float: right;
+height: 30px;
+margin: 15px 10px 0px 10px;
+filter: invert(65%);
 }
 
-.inside_links ul li a {
-    display: block;
-    float: right;
-    color: #755a07;
-    line-height: 62px;
-    margin: 0px 2px 2px 0px;
-    width: 100%;
-    background-color: #e6e6e6;
-    height: 65px;
-    border-bottom: 1px solid #ceb79d96;
-    transition: all 0.5s;
+.inside_links ul li a{
+display: block;
+float: right;
+color: #755a07;
+line-height: 62px;
+margin: 0px 2px 2px 0px;
+width: 100%;
+background-color: #e6e6e6;
+height: 65px;
+border-bottom: 1px solid #ceb79d96;
+transition: all 0.5s;
 }
 .inside_links ul li a:hover{
-	    background: linear-gradient(1turn,#e6ded5cc, #e6e6e6, #e6e6e6);
+    background: linear-gradient(1turn,#e6ded5cc, #e6e6e6, #e6e6e6);
 }
 
 englishContent-w p {

src/app/External-Page/more-news/more-news.component.html

@@ -24,8 +24,17 @@
                 </div>
 
                 <div class="col-12 col-sm-12 col-md-3">
+                  <div class="items inside_links" style="margin-top:0;">
+                    <ul>
+                      <li *ngFor="let externalSer of externalService">
+                        <a href="{{externalSer.link}}">
+                            <img src="{{authSer.pathImg + externalSer.photo}}" />
+                          <span>{{externalSer.name}}</span>
+                        </a>
+                      </li>
+                    </ul>
+                  </div>
                 </div>
-                
               </div>
           
               <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
@@ -39,26 +48,38 @@
       <div class="newsPages-w" [style.min-height.px]="myInnerHeight"  [className]="authSer.arabicTemplate ? '' : 'englishContent-w' ">
           <div class="container">
             <div class="contentPage-w">
-                <div class="row">
-            <div class="col-12 col-sm-12 col-md-9">
-                  <div class="col-12 col-sm-12 col-md-12" *ngFor="let report of dataPagesNews | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }">
-                    <div class="newContent">
-                      <div class="row">
-                        <div class="col-12 col-sm-12 col-md-3">
-                          <div class="imgNew-w">
-                              <img src="{{authSer.pathImg + report.photo.photo}}" />
+              <div class="row">
+                <div class="col-12 col-sm-12 col-md-9">
+                      <div class="col-12 col-sm-12 col-md-12" *ngFor="let report of dataPagesNews | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }">
+                        <div class="newContent">
+                          <div class="row">
+                            <div class="col-12 col-sm-12 col-md-3">
+                              <div class="imgNew-w">
+                                  <img src="{{authSer.pathImg + report.photo.photo}}" />
+                              </div>
+                            </div>
+                            <div class="col-12 col-sm-12 col-md-8">
+                              <h1 (click)="onGetNew(report.id)">{{report.title_en}}</h1>
+                              <p [innerHTML]="report.description_en" (click)="onGetNew(report.id)"></p>
+                            </div>
                           </div>
                         </div>
-                        <div class="col-12 col-sm-12 col-md-8">
-                          <h1 (click)="onGetNew(report.id)">{{report.title_en}}</h1>
-                          <p [innerHTML]="report.description_en" (click)="onGetNew(report.id)"></p>
-                        </div>
                       </div>
-                    </div>
                   </div>
-              </div>
-            <div class="col-12 col-sm-12 col-md-3">cccc</div>
+                <div class="col-12 col-sm-12 col-md-3">
+                  <div class="items inside_links eninside_links" style="margin-top:0;">
+                      <ul>
+                        <li *ngFor="let externalSer of externalService">
+                          <a href="{{externalSer.link}}">
+                              <img src="{{authSer.pathImg + externalSer.photo}}" />
+                            <span>{{externalSer.name_en}}</span>
+                          </a>
+                        </li>
+                      </ul>
+                    </div>
                 </div>
+                
+              </div>
             </div>
             <pagination-controls nextLabel="Next" previousLabel="Prev" (pageChange)="onPageChange($event)"></pagination-controls>
           </div>

src/app/External-Page/more-news/more-news.component.ts

@@ -3,6 +3,7 @@ import { AuthServiceService } from './../../shared/auth-service.service';
 import { Component, OnInit } from '@angular/core';
 import { NgxSpinnerService } from 'ngx-spinner';
 import { Router } from '@angular/router';
+import { ExternalPageService } from '../../shared/external-page.service';
 
 @Component({
   selector: 'app-more-news',
@@ -14,20 +15,38 @@ export class MoreNewsComponent implements OnInit {
   constructor(private authSer: AuthServiceService, 
     private http: HttpClient,
     private router: Router,
+    private externalSer: ExternalPageService,
     private spinner: NgxSpinnerService) {
       this.spinner.show();
      }
 
     dataPagesNews = [];
+    externalService = [];
     perPagePagenation: number = 10;
     count: number;
     currentPage:number = 1;
 
   ngOnInit() {
-    
+
     this.authSer.homeActivate = false;
 
+  
+
+      this.externalSer.getExternalServices().subscribe(
+        (responce) => {
+          console.log(responce);
+          this.externalService = responce['external_services'];
+        },
+        (error) => {
+          console.log(error);
+        }
+      )
+    
     
+    
+
+   
+
     this.http.get(this.authSer.pathApi + '/reports_list_gate/'+ this.currentPage + '/' + this.perPagePagenation + '/1').subscribe(
       (responce) => {
         console.log(responce);
@@ -43,7 +62,7 @@ export class MoreNewsComponent implements OnInit {
       (error) => {
         console.log(error);
       }
-    )
+    );
   }
 
    // /change page 

src/app/External-Page/new-page/new-page.component.css

@@ -26,7 +26,7 @@
 
 .newPage-w .containerContent-w .firstReport-w .img {
     width: 100%;
-    height: 400px;
+    height: 536px;
     margin-top: 20px;
 }
 
@@ -198,6 +198,13 @@ transition: all 0.5s;
     .saredLinks-w li button{
         margin: 5px 0;
     }
+    .newPage-w .containerContent-w .firstReport-w .img {
+        height: 360px;
+    }
+
+    .saredLinks-w {
+        width: 100%;
+    }
 }
 
 @media(min-width:767px) and (max-width: 991px) {

src/app/External-Page/new-page/new-page.component.html

@@ -12,7 +12,7 @@
                   </div>
                   <div class="reprtDetail-w">
                     <div class="row">
-                      <div class="col-6">
+                      <div class="col-12 col-sm-12 col-md-6">
                         <div class="socialMedia-w">
                           <ul class="list-unstyled saredLinks-w" style="float:right;">
                             <li><button class="facebook" ceiboShare  [facebook]="{u: repoUrl}"><i class="fab fa-facebook-f"></i></button></li>
@@ -30,46 +30,14 @@
 
               <div class="col-12 col-sm-12 col-md-3">
                 <div class="items inside_links">
-                  <!-- <ul>
-                    <li>
-                      <a href="service.link">
-                          <img src="http://kfmc.info/back_end/public/uploads/1548286652.png" />
-                        <span>صحه المريض</span>
+                  <ul>
+                    <li *ngFor="let externalSer of externalService; let i = index">
+                      <a href="{{externalSer.link}}">
+                          <img src="{{authSer.pathImg + externalSer.photo}}" />
+                        <span>{{externalSer.name}}</span>
                       </a>
                     </li>
-                    <li>
-                      <a href="service.link">
-                          <img src="http://kfmc.info/back_end/public/uploads/1548286545.png" />
-                        <span> التدريب والتعليم</span>
-                      </a>
-                    </li>
-                    <li>
-                      <a href="service.link">
-                          <img src="http://kfmc.info/back_end/public/uploads/1548286575.png" />
-                        <span>الموظفين</span>
-                      </a>
-                    </li>
-                    <li>
-                      <a href="service.link">
-                        <img src="http://kfmc.info/back_end/public/uploads/1548286592.png" />
-                        <span>التوظيف</span>
-                      </a>
-                      
-                    </li>
-                    <li>
-                      <a href="service.link">
-                        <img src="http://kfmc.info/back_end/public/uploads/1547465492.png" />
-                        <span>نظام البلاغات -OVR </span>
-                      </a>
-                      
-                    </li>
-                    <li>
-                      <a href="service.link">
-                          <img src="http://kfmc.info/back_end/public/uploads/1548286494.png" />
-                        <span> دليل المجمع</span>
-                      </a>
-                    </li>
-                  </ul> -->
+                  </ul>
                 </div>
               </div>
 
@@ -121,48 +89,17 @@
             </div>
 
             <div class="col-12 col-sm-12 col-md-4">
-              <div class="items inside_links eninside_links">
-                  <!-- <ul>
-                    <li>
-                      
-                      <a href="service.link">
-                          <img src="http://kfmc.info/back_end/public/uploads/1548286652.png" />
-                        <span>Pharmacy Library</span>
-                      </a>
-                    </li>
-                    <li>
-                      <a href="service.link">
-                          <img src="http://kfmc.info/back_end/public/uploads/1548286545.png" />
-                        <span>User Guide</span>
-                      </a>
-                    </li>
-                    <li>
-                      <a href="service.link">
-                          <img src="http://kfmc.info/back_end/public/uploads/1548286575.png" />
-                        <span>Employee Handbook</span>
-                      </a>
-                    </li>
-                    <li>
-                      <a href="service.link">
-                        <img src="http://kfmc.info/back_end/public/uploads/1548286592.png" />
-                        <span>Initiatives </span>
-                      </a>
-                      
-                    </li>
-                    <li>
-                      <a href="service.link">
-                        <img src="http://kfmc.info/back_end/public/uploads/1547465492.png" />
-                        <span> OVR System </span>
-                      </a>
-                      
-                    </li>
-                    <li>
-                      <a href="service.link">
-                          <img src="http://kfmc.info/back_end/public/uploads/1548286494.png" />
-                        <span>Medical Library</span>
-                      </a>
-                    </li>
-                  </ul> -->
+              <div class="items inside_links eninside_links" style="margin-top:0">
+                  <div class="items inside_links">
+                      <ul>
+                        <li *ngFor="let externalSer of externalService; let i = index">
+                          <a href="{{externalSer.link}}">
+                              <img src="{{authSer.pathImg + externalSer.photo}}" />
+                            <span>{{externalSer.name_en}}</span>
+                          </a>
+                        </li>
+                      </ul>
+                    </div>
               </div>
             </div>
 

src/app/External-Page/new-page/new-page.component.ts

@@ -3,6 +3,7 @@ import { ActivatedRoute, Params } from '@angular/router';
 import { AuthServiceService } from './../../shared/auth-service.service';
 import { Component, OnInit } from '@angular/core';
 import { NgxSpinnerService } from 'ngx-spinner';
+import { ExternalPageService } from '../../shared/external-page.service';
 
 @Component({
   selector: 'app-new-page',
@@ -14,11 +15,13 @@ export class NewPageComponent implements OnInit {
   constructor(private authSer: AuthServiceService, 
     private http: HttpClient,
     private spinner: NgxSpinnerService,
+    private externalService: ExternalPageService,
     private route:ActivatedRoute) { 
       this.spinner.show();
     }
 
     reportId: number;
+
     reportData = {
       created_at: '',
       title: '',
@@ -32,6 +35,8 @@ export class NewPageComponent implements OnInit {
       photo: '',
     };
 
+    externalServices = [];
+
   ngOnInit() {
     
     this.authSer.homeActivate = false;
@@ -42,6 +47,19 @@ export class NewPageComponent implements OnInit {
       }
     );
 
+
+    //get external services data
+    this.externalService.getExternalServices().subscribe(
+      (responce) => {
+        console.log('serviceees', responce);
+        this.externalService = responce['external_services'];
+      }, 
+      (error) => {
+        console.log(error);
+      }
+    );
+    
+
     this.http.get(this.authSer.pathApi + '/get_report/' + this.reportId).subscribe(
       (responce) => {
         console.log(responce);
@@ -68,6 +86,8 @@ export class NewPageComponent implements OnInit {
       }
     );
 
+
+
   }
 
 }

src/app/Internal-Page/news-page/news-page.component.html

@@ -53,42 +53,10 @@
 			<div class="col-12 col-sm-12 col-md-3">
 					<div class="col-12 col-sm-12 col-md-12 inside_links">
 						<ul>
-							<li>
-								<a href="service.link">
-									 <img src="http://kfmc.info/back_end/public/uploads/1548286652.png" />
-									<span>مكتبة الصيدلية</span>
-								</a>
-							</li>
-							<li>
-								<a href="service.link">
-									 <img src="http://kfmc.info/back_end/public/uploads/1548286545.png" />
-									<span>دليل المستخدم</span>
-								</a>
-							</li>
-							<li>
-								<a href="service.link">
-									 <img src="http://kfmc.info/back_end/public/uploads/1548286575.png" />
-									<span>كتيب الموظف</span>
-								</a>
-							</li>
-							<li>
-								<a href="service.link">
-									<img src="http://kfmc.info/back_end/public/uploads/1548286592.png" />
-									<span>مبادرات </span>
-								</a>
-								
-							</li>
-							<li>
-								<a href="service.link">
-									<img src="http://kfmc.info/back_end/public/uploads/1547465492.png" />
-									<span>نظام البلاغات -OVR </span>
-								</a>
-								
-							</li>
-							<li>
-								<a href="service.link">
-									 <img src="http://kfmc.info/back_end/public/uploads/1548286494.png" />
-									<span>المكتبة الطبية </span>
+							<li *ngFor="let internalSer of internalServices">
+								<a href="{{internalSer.link}}">
+									 <img src="{{authSer.pathImg + internalSer.photo}}" />
+									<span>{{internalSer.name}}</span>
 								</a>
 							</li>
 						</ul>
@@ -112,43 +80,10 @@
 					<div class="col-12 col-sm-12 col-md-3">
 					<div class="col-12 col-sm-12 col-md-12 inside_links eninside_links">
 						<ul>
-							<li>
-								
-								<a href="service.link">
-									 <img src="http://kfmc.info/back_end/public/uploads/1548286652.png" />
-									<span>Pharmacy Library</span>
-								</a>
-							</li>
-							<li>
-								<a href="service.link">
-									 <img src="http://kfmc.info/back_end/public/uploads/1548286545.png" />
-									<span>User Guide</span>
-								</a>
-							</li>
-							<li>
-								<a href="service.link">
-									 <img src="http://kfmc.info/back_end/public/uploads/1548286575.png" />
-									<span>Employee Handbook</span>
-								</a>
-							</li>
-							<li>
-								<a href="service.link">
-									<img src="http://kfmc.info/back_end/public/uploads/1548286592.png" />
-									<span>Initiatives </span>
-								</a>
-								
-							</li>
-							<li>
-								<a href="service.link">
-									<img src="http://kfmc.info/back_end/public/uploads/1547465492.png" />
-									<span> OVR System </span>
-								</a>
-								
-							</li>
-							<li>
-								<a href="service.link">
-									 <img src="http://kfmc.info/back_end/public/uploads/1548286494.png" />
-									<span>Medical Library</span>
+							<li *ngFor="let internalSer of internalServices">
+								<a href="{{internalSer.link}}">
+										<img src="{{authSer.pathImg + internalSer.photo}}" />
+									<span>{{internalSer.name_en}}</span>
 								</a>
 							</li>
 						</ul>

src/app/Internal-Page/news-page/news-page.component.ts

@@ -24,6 +24,7 @@ export class NewsPageComponent implements OnInit {
   
   newsId: number;
   newsData = [];
+  internalServices = [];
   checkLength:boolean = false;
   myInnerHeight = window.innerHeight;
   image0 = {
@@ -61,6 +62,16 @@ export class NewsPageComponent implements OnInit {
       }
     );
 
+    this.internalService.getInternalServices().subscribe(
+      (responce) => {
+        console.log(responce);
+        this.internalServices = responce['external_services'];
+      },
+      (error) => {
+        console.log(error);
+      }
+    )
+
   }
 
 }

src/app/Internal-Page/news-pages/news-pages.component.html

@@ -26,44 +26,11 @@
 				<div class="col-12 col-sm-12 col-md-3">
 					<div class="col-12 col-sm-12 col-md-12 inside_links">
 						<ul>
-							<li>
-								
-								<a href="service.link">
-									 <img src="http://kfmc.info/back_end/public/uploads/1548286652.png" />
-									<span>مكتبة الصيدلية</span>
-								</a>
-							</li>
-							<li>
-								<a href="service.link">
-									 <img src="http://kfmc.info/back_end/public/uploads/1548286545.png" />
-									<span>دليل المستخدم</span>
-								</a>
-							</li>
-							<li>
-								<a href="service.link">
-									 <img src="http://kfmc.info/back_end/public/uploads/1548286575.png" />
-									<span>كتيب الموظف</span>
-								</a>
-							</li>
-							<li>
-								<a href="service.link">
-									<img src="http://kfmc.info/back_end/public/uploads/1548286592.png" />
-									<span>مبادرات </span>
-								</a>
-								
-							</li>
-							<li>
-								<a href="service.link">
-									<img src="http://kfmc.info/back_end/public/uploads/1547465492.png" />
-									<span>نظام البلاغات -OVR </span>
-								</a>
-								
-							</li>
-							<li>
-								<a href="service.link">
-									 <img src="http://kfmc.info/back_end/public/uploads/1548286494.png" />
-									<span>المكتبة الطبية </span>
-								</a>
+							<li *ngFor="let internalSer of internalServices">
+									<a href="{{internalSer.link}}">
+											<img src="{{authSer.pathImg + internalSer.photo}}" />
+										<span>{{internalSer.name}}</span>
+									</a>
 							</li>
 						</ul>
 					</div>
@@ -87,24 +54,35 @@
         <div class="container">
           <div class="contentPage-w">
               <div class="row">
-				  <div class="col-12 col-sm-12 col-md-9">
-                <div class="col-12 col-sm-12 col-md-12" *ngFor="let report of dataPagesNews | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }">
-                  <div class="newContent">
-                    <div class="row">
-                      <div class="col-12 col-sm-12 col-md-3">
-                        <div class="imgNew-w">
-                            <img src="{{authSer.pathImg + report.photo.photo}}" />
-                        </div>
-                      </div>
-                      <div class="col-12 col-sm-12 col-md-8">
-                        <h1 (click)="onGetNew(report.id)">{{report.title_en}}</h1>
-                        <p [innerHTML]="report.description_en" (click)="onGetNew(report.id)"></p>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-					  </div>
-				  <div class="col-12 col-sm-12 col-md-3">cccc</div>
+								<div class="col-12 col-sm-12 col-md-9">
+											<div class="col-12 col-sm-12 col-md-12" *ngFor="let report of dataPagesNews | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }">
+												<div class="newContent">
+													<div class="row">
+														<div class="col-12 col-sm-12 col-md-3">
+															<div class="imgNew-w">
+																	<img src="{{authSer.pathImg + report.photo.photo}}" />
+															</div>
+														</div>
+														<div class="col-12 col-sm-12 col-md-8">
+															<h1 (click)="onGetNew(report.id)">{{report.title_en}}</h1>
+															<p [innerHTML]="report.description_en" (click)="onGetNew(report.id)"></p>
+														</div>
+													</div>
+												</div>
+											</div>
+									</div>
+							
+									<div class="col-12 col-sm-12 col-md-12 inside_links eninside_links">
+										<ul>
+											<li *ngFor="let internalSer of internalService">
+												<a href="{{internalSer.link}}">
+														<img src="{{authSer.pathImg + internalSer.photo}}" />
+													<span>{{internalSer.name_en}}</span>
+												</a>
+											</li>
+										</ul>
+									</div>
+
               </div>
           </div>
           <pagination-controls nextLabel="Next" previousLabel="Prev" (pageChange)="onPageChange($event)"></pagination-controls>

src/app/Internal-Page/news-pages/news-pages.component.ts

@@ -1,3 +1,4 @@
+import { InternalPageService } from './../../shared/internal-page.service';
 import { AuthServiceService } from './../../shared/auth-service.service';
 import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
@@ -14,16 +15,19 @@ export class NewsPagesComponent implements OnInit {
   constructor(private http: HttpClient, 
     private authSer: AuthServiceService,
     private spinner: NgxSpinnerService, 
+    private internalSer: InternalPageService,
     private router: Router) { }
 
   myInnerHeight = window.innerHeight;
 
   dataPagesNews= [];
+  internalService = [];
   perPagePagenation: number = 10;
   count: number;
   currentPage:number = 1;
 
   ngOnInit() {
+
     this.spinner.show();
     console.log(this.authSer.pathImg);
     this.http.get(this.authSer.pathApi + '/reports_list_gate/' + this.currentPage + '/' + this.perPagePagenation + '/internal').subscribe(
@@ -42,7 +46,18 @@ export class NewsPagesComponent implements OnInit {
       (error) => {
         console.log(error);      
       }
-    )
+    );
+
+    this.internalSer.getInternalServices().subscribe(
+      (responce) => {
+        console.log(responce);
+        this.internalService = responce['external_services'];
+      },
+      (error) => {
+        console.log(error);
+      }
+    );
+
   }
 
       // /change page 

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

@@ -2,7 +2,7 @@
   <div class="row">
     <div class="col-12">
       <ul class="list-unstyled titileLi-w">
-        <li class="headingText-w">خدمه إداره المحتوي > </li>
+        <li class="headingText-w">خدمه إداره المحتوي  </li>
         <li class="headingText-w activeLi-w" style="margin-right:5px"> الإنجازات العامه</li>
       </ul>
     </div>
@@ -25,7 +25,7 @@
     <div class="row">
       <div class="col-12 col-sm-12 col-md-12 col-lg-6">
         <div class="form-group">
-          <span class="spanSelect-w">
+          <span class="spanSelect-w" style="margin-right:10px;">
             <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
               <option value="5">5</option>
               <option value="10">10</option>

src/app/dashboard/achievements/add-achievement/add-achievement.component.html

@@ -3,8 +3,8 @@
   <div class="row" style="margin-bottom: 30px;">
     <div class="col-12">
       <ul class="list-unstyled titileLi-w">
-        <li class="headingText-w">خدمه إداره المحتوي > </li>
-        <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الإنجازات العامه > </li>
+        <li class="headingText-w">خدمه إداره المحتوي </li>
+        <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الإنجازات العامه </li>
         <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
       </ul>
     </div>
@@ -16,21 +16,60 @@
 
       <form (ngSubmit)="onSubmitted()" #f="ngForm">
         <div class="row">
-          <div class="col-12 col-sm-12 col-md-6">
+
+          <div class="col-12 col-sm-12 col-md-4">
             <div class="form-group">
               <label for="title" style="float: right; margin-right: 5px">العنوان باللغه العربيه <span class="spanReqired-w">*</span></label>
               <input type="text" class="form-control" placeholder="العنوان باللغه العربيه" id="title" name="title" ngModel [ngModel]="achiv.title" #title="ngModel" required/>
             </div>
           </div>
-          <div class="col-12 col-sm-12 col-md-6">
+
+          <div class="col-12 col-sm-12 col-md-4">
             <div class="form-group">
               <label for="title_en" style="float: right; margin-right: 5px">العنوان باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
               <input type="text" class="form-control" id="title_en" placeholder="العنوان باللغه الانجليزيه" name="title_en" ngModel [ngModel]="achiv.title_en" #title="ngModel" required/>
             </div>
           </div>
 
-          <label for="description" style="float:right;margin-right: 5px">الوصف باللغه العربيه <span class="spanReqired-w">*</span></label>
+          <div class="col-12 col-sm-12 col-md-4">
+            <div class="form-group">
+              <label for="date" style="float: right; margin-right: 5px"> التاريخ <span class="spanReqired-w">*</span></label>
+              <input type="date" class="form-control" id="date" name="achievement_time" ngModel [ngModel]="achiv.date" #date="ngModel" required/>
+            </div>
+          </div>
+
+          <div class="col-12 col-sm-12 col-md-4">
+            <div class="form-group">
+                <label for="status" style="float: right; margin-right: 5px"> الحاله <span class="spanReqired-w">*</span></label>
+                <select class="form-control" name="status" [ngModel]="achiv.status">
+                  <option value="0">فعال</option>
+                  <option value="1">غير فعال</option>
+                </select>
+            </div>
+          </div>
+
+          <div class="col-12 col-sm-12 col-md-4">
+            <div class="form-group">
+                <label for="status" style="float: right; margin-right: 5px"> الترتيب <span class="spanReqired-w">*</span></label>
+                <select class="form-control" name="ranking" [ngModel]="achiv.ranking">
+                  <option value="1">1</option>
+                  <option value="2">2</option>
+                  <option value="3">3</option>
+                  <option value="4">4</option>
+                  <option value="10000">المزيد</option>
+                </select>
+            </div>
+          </div>
+
+          <!-- <div class="col-12 col-sm-12 col-md-4">
+            <div class="form-group">
+              <label for="title_en" style="float: right; margin-right: 5px">العنوان باللغه الإنجليزيه <span class="spanReqired-w">*</span></label>
+              <input type="text" class="form-control" id="title_en" placeholder="العنوان باللغه الانجليزيه" name="title_en" ngModel [ngModel]="achiv.title_en" #title="ngModel" required/>
+            </div>
+          </div> -->
+
           <div class="col-12 col-sm-12 col-md-12">
+            <label for="description" style="float:right;margin-right: 5px">الوصف باللغه العربيه <span class="spanReqired-w">*</span></label>
             <div class="form-group">
               <quill-editor name="description" ngModel [ngModel]="achiv.description" #description="ngModel" required>
 
@@ -38,8 +77,8 @@
             </div>
           </div>
 
-          <label for="description_en" style="float:right;margin-right: 5px">الوصف باللغه الانجليزيه <span class="spanReqired-w">*</span></label>
           <div class="col-12 col-sm-12 col-md-12">
+            <label for="description_en" style="float:right;margin-right: 5px">الوصف باللغه الانجليزيه <span class="spanReqired-w">*</span></label>
             <div class="form-group">
               <quill-editor id="description_en" name="description_en" ngModel [ngModel]="achiv.description_en" #description="ngModel" required>
 

src/app/dashboard/achievements/add-achievement/add-achievement.component.ts

@@ -36,6 +36,9 @@ export class AddAchievementComponent implements OnInit {
       title_en: '',
       description: '',
       description_en: '',
+      date: '',
+      status: '',
+      ranking: '',
     }
 
   ngOnInit() {
@@ -62,6 +65,9 @@ export class AddAchievementComponent implements OnInit {
               this.achiv.title_en = responce['achievement'].title_en;
               this.achiv.description = responce['achievement'].description;
               this.achiv.description_en = responce['achievement'].description_en;
+              this.achiv.date = responce['achievement'].achievement_time;
+              this.achiv.status = responce['achievement'].status;
+              this.achiv.ranking = responce['achievement'].ranking;
               this.spinner.hide();
             }
           );

src/app/dashboard/add-join-us/add-join-us.component.css

@@ -86,3 +86,7 @@ input,select {
     float: right !important;
     margin: 40px 0 !important;
 }
+
+.calendar {
+    border: none !important;
+}

src/app/dashboard/add-join-us/add-join-us.component.html

@@ -3,8 +3,8 @@
       <div class="row">
         <div class="col-12">
           <ul class="list-unstyled titileLi-w">
-            <li class="headingText-w">خدمه اداره المحتوي > </li>
-            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">إنضم الينا > </li>
+            <li class="headingText-w">خدمه اداره المحتوي  </li>
+            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">إنضم الينا  </li>
             <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}}  </li>
           </ul>
         </div>
@@ -51,12 +51,22 @@
             <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" formControlName="adminstration_id" (change)="getDepartment()">
+                <select class="form-control" formControlName="adminstration_id">
                   <option *ngFor="let admin of adminstrations; let i = index" [value]="admin.id">{{admin.name}}</option>
                 </select>
               </div>
             </div>
 
+            <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" formControlName="status">
+                  <option value="1">فعال</option>
+                  <option value="0">غير فعال</option>
+                </select>
+              </div>
+            </div>
+
             <div class="col-12">
                 <button type="submit" [disabled]="!joinUsForm.valid || checkSaveClick" class="btn btn-success rightW">حفظ</button>
                 <button type="button" class="btn btn-warning rightW" (click)="authSer.backFromEdit()">إلغاء</button>

src/app/dashboard/add-join-us/add-join-us.component.ts

@@ -40,10 +40,16 @@ export class AddJoinUsComponent implements OnInit {
     bindingDateSplit;
 
 
+    currentDate: any = Date.now();
    
 
 
   ngOnInit() {
+
+    
+    
+
+
     //show / hide notification search in header
     this.authSer.notificationLogin = true;
     this.authSer.showSearchHeader = false;
@@ -68,8 +74,8 @@ export class AddJoinUsComponent implements OnInit {
     this.joinUsForm = new FormGroup({
       name: new FormControl(null, Validators.required),
       name_en: new FormControl(null, Validators.required),
-      //date_of_employment_hij: new FormControl(null, Validators.required),
       adminstration_id: new FormControl(null, Validators.required),
+      status: new FormControl(null, Validators.required),
     });
 
     //get adminstration
@@ -100,6 +106,7 @@ export class AddJoinUsComponent implements OnInit {
               name_en: responce['user'].name_en,
               //date_of_employment_hij: responce['user'].date_of_employment_hij,
               adminstration_id: responce['user'].adminstration_id,
+              status: responce['user'].status,
             });
             this.urlImg = responce['user'].photo ? this.authSer.pathImg + responce['user'].photo : this.urlImg;
             const date = responce['user'].date_of_employment_hij.split('-');
@@ -154,11 +161,14 @@ export class AddJoinUsComponent implements OnInit {
 
 
   onSubmittedForm() {
+
     this.checkSaveClick = true;
     console.log(this.joinUsForm.value);
     const formData = this.joinUsForm.value;
+    const dateHigriArray = this.higriDateVal.split('-');
+    console.log('higriiii datttte', this.higriDateVal);
     formData['date_of_employment_hij'] = this.higriDateVal;
-    console.log(formData);
+    console.log(dateHigriArray);
     if(this.checkChangeImage){
       formData['photo'] = this.imageBase64;
       formData['photo_type'] = this.photoType[1];
@@ -186,12 +196,15 @@ export class AddJoinUsComponent implements OnInit {
           (error) => {
             this.checkSaveClick = false;
             console.log(error);
-            this.toastr.error('خطأ في التعديل');
+            if(error.error['status'] == 'invalid date_of_employment_hij') {
+              this.toastr.error('تاريخ التوظيف الهجري لا يجب ان يكون في الحاضر او اليوم');
+            } else {
+              this.toastr.error('خطأ في السيرفير');
+            }
           }
         );
       }
     } else {
-
       if(this.imageBase64 == '') {
         this.toastr.warning('قم باختيار صوره !');
         this.checkSaveClick = false;
@@ -205,12 +218,17 @@ export class AddJoinUsComponent implements OnInit {
           },
           (error) => {
             this.checkSaveClick = false;
-            console.log(error);
-            this.toastr.error('خطأ في الإنشاء');
+            console.log(error.error['status']);
+            if(error.error['status'] == 'invalid date_of_employment_hij') {
+              this.toastr.error('تاريخ التوظيف الهجري لا يجب ان يكون في الحاضر او اليوم');
+            } else {
+              this.toastr.error('خطأ في السيرفير');
+            }
           }
         );
       }
     }
 
   }
+
 }

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

@@ -0,0 +1,30 @@
+.table {
+    margin: 30px 0;
+}
+
+.dashButton-w {
+    float: right;
+    margin: 10px;
+}
+
+.custom-control-label::after,
+.custom-control-label::before {
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.fixedWidthLabel-w::after,
+.fixedWidthLabel-w::before {
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.disblayBlock-w {
+    display: block;
+}
+
+/* .centerIneerItem {
+    display: flex;
+    justify-content: center;
+    text-align: center;
+} */

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

@@ -10,20 +10,23 @@
   </div>
 
 
-  <div class="row">
-    <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-      <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
-      <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
-    </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)"/>
-        <hr>
+
+
+  <div class="containerContent-w">
+    
+    <div class="row">
+      <div class="col-12 col-sm-12 col-md-6 col-lg-6">
+        <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+        <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
+      </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)"/>
+          <hr>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="containerContent-w">
     <div class="row">
       <div class="col-12 col-sm-12 col-md-12 col-lg-6">
         <div class="form-group">

src/app/dashboard/bar-events/bar-events-list/bar-events-list.component.css

@@ -0,0 +1,30 @@
+.table {
+    margin: 30px 0;
+}
+
+.dashButton-w {
+    float: right;
+    margin: 10px;
+}
+
+.custom-control-label::after,
+.custom-control-label::before {
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.fixedWidthLabel-w::after,
+.fixedWidthLabel-w::before {
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.disblayBlock-w {
+    display: block;
+}
+
+/* .centerIneerItem {
+    display: flex;
+    justify-content: center;
+    text-align: center;
+} */

src/app/dashboard/bar-events/bar-events-list/bar-events-list.component.html

@@ -10,20 +10,21 @@
   </div>
 
 
-  <div class="row">
-    <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-      <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
-      <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
-    </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)"/>
-        <hr>
+  <div class="containerContent-w">
+    
+    <div class="row">
+      <div class="col-12 col-sm-12 col-md-6 col-lg-6">
+        <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+        <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
+      </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)"/>
+          <hr>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="containerContent-w">
     <div class="row">
       <div class="col-12 col-sm-12 col-md-12 col-lg-6">
         <div class="form-group">

src/app/dashboard/contact-us/contact-us-list/contact-us-list.component.html

@@ -64,7 +64,7 @@
               <label class="custom-control-label disblayBlock-w" for="{{contactUs.id}}" style="color:#2a2a2a;cursor: pointer;"></label>
             </div>
           </td>
-          <td>{{contactUs.field}}</td>
+          <td [innerHtml]="contactUs.field"></td>
 
           <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(contactUs.id)"><i class="fas fa-edit"></i></button></td>
         </tr>

src/app/dashboard/event-calendars/event-calendars-list/event-calendars-list.component.css

@@ -0,0 +1,30 @@
+.table {
+    margin: 30px 0;
+}
+
+.dashButton-w {
+    float: right;
+    margin: 10px;
+}
+
+.custom-control-label::after,
+.custom-control-label::before {
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.fixedWidthLabel-w::after,
+.fixedWidthLabel-w::before {
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.disblayBlock-w {
+    display: block;
+}
+
+/* .centerIneerItem {
+    display: flex;
+    justify-content: center;
+    text-align: center;
+} */

src/app/dashboard/event-calendars/event-calendars-list/event-calendars-list.component.html

@@ -10,20 +10,23 @@
   </div>
 
 
-  <div class="row">
-    <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-      <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
-      <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
-    </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)"/>
-        <hr>
+
+
+  <div class="containerContent-w">
+      
+    <div class="row">
+      <div class="col-12 col-sm-12 col-md-6 col-lg-6">
+        <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+        <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
+      </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)"/>
+          <hr>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="containerContent-w">
     <div class="row">
       <div class="col-12 col-sm-12 col-md-12 col-lg-6">
         <div class="form-group">

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

@@ -4,8 +4,8 @@
     <div class="row" style="margin-bottom: 30px;">
       <div class="col-12">
         <ul class="list-unstyled titileLi-w">
-          <li class="headingText-w">خدمه إداره المحتوي > </li>
-          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> إداره التهاني والتعازي > </li>
+          <li class="headingText-w">خدمه إداره المحتوي  </li>
+          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> إداره التهاني والتعازي  </li>
           <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
         </ul>
       </div>
@@ -32,13 +32,13 @@
               </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" name="name" ngModel [ngModel]="event.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]="event.name_en" #name="ngModel" required/>
                 </div>
               </div>
@@ -57,18 +57,7 @@
                   <!-- <span *ngIf="!name.valid && name.touched"></span>  -->
                 </div>
               </div>
-
-              <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                <div class="form-group">
-                  <label for="display_location" style="float: right; margin-right: 5px"> الصفحه <span class="spanReqired-w">*</span></label>
-                  <select class="form-control" name="display_location" [ngModel]="event.display_location" id="display_location" required>
-                    <option value="internal">داخليه</option>
-                    <option value="external">خارجيه</option>
-                    <option value="both">كلاهما</option>
-                  </select>
-                </div>
-              </div>
-
+              
               <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                 <div class="form-group">
                   <label for="type" style="float: right;margin-right: 5px"> النوع <span class="spanReqired-w">*</span></label>
@@ -89,10 +78,10 @@
 
               <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                 <label for="date" style="float: right; margin-right: 5px">التاريخ</label>
-                <div *ngIf='bindingDateSplit && checkMode'>
+                <div *ngIf='bindingDateSplit && typeMode'>
                   <app-higri-date (onDatePicked)="getDate($event)" [myDate]="bindingDateSplit"></app-higri-date>
                 </div>
-                <div *ngIf='!checkMode'>
+                <div *ngIf='!typeMode'>
                   <app-higri-date (onDatePicked)="getDate($event)" ></app-higri-date>
                 </div>
               </div>

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

@@ -31,7 +31,6 @@ export class AddEventComponent implements OnInit {
     name: '',
     name_en: '',
     ranking: '',
-    display_location: '',
     type: '',
     status: '',
     time: '',
@@ -60,9 +59,9 @@ export class AddEventComponent implements OnInit {
     this.route.params.subscribe(
       (params: Params) => {
         if(params['typeEventMode'] == 'edit') {
+          this.typeMode = true;
           this.typeLink = 'تعديل';
           this.spineer.show();
-          this.typeMode = true;
           this.eventId = params['editEventId'];
           this.eventService.getEventData(this.eventId).subscribe(
             (responce) => {
@@ -70,14 +69,24 @@ export class AddEventComponent implements OnInit {
               const eventData = responce['event'][0];
               console.log(eventData);
               this.event.name = eventData.name;
+              this.event.employee_name = eventData.employee_name;
+              this.event.employee_name_en = eventData.employee_name_en;
               this.event.name_en = eventData.name_en;
               this.event.ranking = eventData.ranking;
-              this.event.display_location = eventData.display_location;
               this.event.type = eventData.type;
               this.event.status = eventData.status;
               const dateTime = eventData.event_time.split(' ');
               this.event.time = dateTime[1];
-              this.bindingDateSplit = dateTime[0];
+              const higriDate = dateTime[0].split('-');
+              console.log('higrrrrrrrri', higriDate);
+              this.higriDateVal = dateTime[0];
+              this.bindingDateSplit = {
+                'year': parseInt(higriDate[0]),
+                'month': parseInt(higriDate[1]),
+                'day': parseInt(higriDate[2])
+              };
+
+              console.log('hhhhhhhhhhhhhhh' , this.bindingDateSplit);
               this.spineer.hide();
             },
             (error) => {
@@ -104,8 +113,14 @@ export class AddEventComponent implements OnInit {
     this.checkSaveClick = true;
     console.log(this.eventForm.value);
     this.eventForm.value['date'] = this.higriDateVal;
-    this.eventForm.value.event_time = this.eventForm.value.date + this.eventForm.value.time;
+    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;
+    }
+    console.log(this.eventForm.value.event_time);
     delete this.eventForm.value.time;
+    delete this.eventForm.value.date;
 
     console.log(this.eventForm.value); 
     if(this.typeMode) {
@@ -117,7 +132,12 @@ export class AddEventComponent implements OnInit {
           this.checkSaveClick = false;
         },
         (error) => {
-          this.toastr.error('حدث خطأ !');
+          console.log(error.error['status']);
+          if(error.error.status == 'invalid event_time') {
+            this.toastr.warning('يجب ان يكون الحدث في وقت سابق !');
+          } else {
+            this.toastr.error('حدث خطأ !');
+          }
           console.log(error);
           this.checkSaveClick = false;
         }
@@ -131,7 +151,12 @@ export class AddEventComponent implements OnInit {
           this.checkSaveClick = false;
         },
         (error) => {
-          this.toastr.error('حدث خطأ !');
+          console.log(error.error['status']);
+          if(error.error.status == 'invalid event_time') {
+            this.toastr.warning('يجب ان يكون الحدث في وقت سابق !');
+          } else {
+            this.toastr.error('حدث خطأ !');
+          }
           console.log(error);
           this.checkSaveClick = false;
         }

src/app/dashboard/events/events.component.html

@@ -3,7 +3,7 @@
   <div class="row">
     <div class="col-12">
       <ul class="list-unstyled titileLi-w">
-        <li class="headingText-w">خدمه إداره المحتوي > </li>
+        <li class="headingText-w">خدمه إداره المحتوي  </li>
         <li class="headingText-w activeLi-w" style="margin-right:5px">مشاركه اللحظات </li>
       </ul>
     </div>
@@ -52,9 +52,9 @@
               <!-- <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>النوع</th>
           <th *ngIf="authSer.showEditBtn">تعديل</th>
         </tr>
@@ -66,11 +66,11 @@
               <input type="checkbox" class="custom-control-input" id="{{event.id}}" [(ngModel)]="event.selected" [value]='event' (change)="checkIfAllSelected();">
             </div>
           </td>
+          <td>{{event.employee_name}}</td>
           <td>{{event.name}}</td>
           <td>
-            {{event.ranking}}
+            {{event.ranking == '10000' ? 'المزيد' : event.ranking}}
           </td>
-          <td>{{event.display_location == 'both' ? 'كلاهما' : event.display_location == 'internal' ? 'الصفحه الداخليه' : event.display_location == 'external' ? 'الصفحه الخارجيه' : 'No'}}</td>
           <td>{{event.type == '0' ? 'التعازي' : event.type == '1' ? 'التهاني' : 'No'}}</td>
           <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(event.id)"><i class="fas fa-edit"></i></button></td>
         </tr>

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

@@ -0,0 +1,30 @@
+.table {
+    margin: 30px 0;
+}
+
+.dashButton-w {
+    float: right;
+    margin: 10px;
+}
+
+.custom-control-label::after,
+.custom-control-label::before {
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.fixedWidthLabel-w::after,
+.fixedWidthLabel-w::before {
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.disblayBlock-w {
+    display: block;
+}
+
+/* .centerIneerItem {
+    display: flex;
+    justify-content: center;
+    text-align: center;
+} */

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

@@ -1,29 +1,31 @@
 <div class="container">
 
-  <div class="row">
-    <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>
-      </ul>
+
+    <div class="row">
+      <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>
+        </ul>
+      </div>
     </div>
-  </div>
 
 
-  <div class="row">
-    <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-      <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
-      <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
-    </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)"/>
-        <hr>
+  <div class="containerContent-w">
+    
+    <div class="row">
+      <div class="col-12 col-sm-12 col-md-6 col-lg-6">
+        <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+        <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
+      </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)"/>
+          <hr>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="containerContent-w">
     <div class="row">
       <div class="col-12 col-sm-12 col-md-12 col-lg-6">
         <div class="form-group">

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

@@ -4,8 +4,8 @@
     <div class="row" style="margin-bottom: 30px;">
         <div class="col-12">
           <ul class="list-unstyled titileLi-w">
-            <li class="headingText-w">خدمه إداره المحتوي > </li>
-            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> الخدمات الخارجيه > </li>
+            <li class="headingText-w">خدمه إداره المحتوي </li>
+            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> الخدمات الخارجيه </li>
             <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
           </ul>
           <hr class="hr">
@@ -15,7 +15,6 @@
     <div class="containerContent-w">
         <div class="row">
             <div class="col-12">
-
               <form (ngSubmit)="onSubmitted()" #f="ngForm">
                 <div class="row">
                   <div class="col-12 col-sm-12 col-md-12 col-lg-12" style="margin-bottom:30px">
@@ -73,7 +72,6 @@
                   </div>
                 </div>
               </form>
-
             </div>
           </div>
     </div>

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

@@ -132,12 +132,12 @@ export class AddExternalComponent implements OnInit {
   }
 
   if(this.typeMode){
-    if((this.photoType[1] != 'png' && this.photoType[1] != 'gif') && this.photoEdit == true) {
-      this.toastr.warning('الصوره يجب أن تكون بصيغه Png');
-      this.checkSaveClick = false;
-    } else if(this.imageBase64 == '' && this.photoEdit == true){
+    if(this.imageBase64 == '' && this.photoEdit == true) {
       this.toastr.warning('قم باختيار صوره !');
       this.checkSaveClick = false;
+    } else if((this.photoType[1] != 'png' && this.photoType[1] != 'gif') && this.photoEdit == true){
+      this.toastr.warning('الصوره يجب أن تكون بصيغه Png');
+      this.checkSaveClick = false;
     } else {
       if(this.serviceId == 6) {
         this.dashBoardService.editItem( this.externalId, formData, 'internalServiceExternalPage').subscribe(
@@ -170,14 +170,13 @@ export class AddExternalComponent implements OnInit {
       }
     }
   } else {
-    if(this.photoType[1] != 'png' && this.photoType[1] != 'gif') {
-      this.toastr.warning('الصوره يجب أن تكون بصيغه Png');
-      this.checkSaveClick = false;
-    } else if(this.imageBase64 == ''){
+    if(this.imageBase64 == '') {
       this.toastr.warning('قم باختيار صوره !');
       this.checkSaveClick = false;
+    } else if(this.photoType[1] != 'png' && this.photoType[1] != 'gif'){
+      this.toastr.warning('الصوره يجب أن تكون بصيغه Png');
+      this.checkSaveClick = false;
     } else {
-
       if(this.serviceId == 6){
         this.dashBoardService.addItem(formData, 'internalServiceExternalPage').subscribe(
           (responce) => {

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

@@ -3,7 +3,7 @@
   <div class="row">
     <div class="col-12">
         <ul class="list-unstyled titileLi-w">
-          <li class="headingText-w">خدمه الصلاحيات > </li>
+          <li class="headingText-w">خدمه الصلاحيات   </li>
           <li class="headingText-w activeLi-w" style="margin-right:5px">الخدمات الخارجيه</li>
         </ul>
     </div>
@@ -67,7 +67,7 @@
               </td>
               <td>{{external.name}}</td>
               <td>
-                {{external.ranking}}
+                {{ external.ranking == 10000 ? 'المزيد' : external.ranking }}
                 <!-- <select class="form-control" [ngModel]="external.ranking" (change)="changeRanking($event, external.id)">
                   <option value="1">1</option>
                   <option value="2">2</option>

src/app/dashboard/header/header.component.ts

@@ -28,6 +28,16 @@ export class HeaderComponent implements OnInit {
     this.authSer.showHeaderLogin = true;
     this.authSer.showHeaderDashBoard = false;
 
+
+    this.authSer.onGetFooterData('internal').subscribe(
+      (responce) => {
+        this.authSer.footerData = responce['footer'];
+        console.log(this.authSer.footerData);
+      },
+      (error) => {
+        console.log(error);
+      }
+    );
     
     // const m = moment().format('iYYYY/iM/iD');
     // console.log(m);

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

@@ -5,7 +5,7 @@
       <div class="col-12">
         <ul class="list-unstyled titileLi-w">
           <li class="headingText-w">{{servicesType}} </li>
-          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> {{typeFirstLink}} > </li>
+          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> {{typeFirstLink}}  </li>
           <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
         </ul>
       </div>
@@ -40,6 +40,7 @@
                       <select class="form-control" formControlName="display_location" id="displayLocation">
                         <option value="internal">داخليه</option>
                         <option value="external">خارجيه</option>
+                        <option value="both">كلاهما</option>
                       </select>
                     </div>
                   </div>

src/app/dashboard/lectures/add-lecture/add-lecture.component.html

@@ -4,8 +4,8 @@
     <div class="row" style="margin-bottom: 30px;">
       <div class="col-12">
         <ul class="list-unstyled titileLi-w">
-          <li class="headingText-w">خدمه إداره المحتوي > </li>
-          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">شريط الأحداث والتفاعلات الداخليه > </li>
+          <li class="headingText-w">خدمه إداره المحتوي</li>
+          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">شريط الأحداث والتفاعلات الداخليه </li>
           <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
         </ul>
       </div>
@@ -60,6 +60,7 @@
                 <input type="datetime-local" class="form-control" name="lecture_time" [ngModel]="lecture.lecture_time" id="lecture_time" required />
               </div>
             </div>
+
             <div class="col-12 col-sm-12 col-md-4">
               <div class="form-group">
                 <label for="lecture_end" style="float: right;margin-right: 5px"> وقت الإنتهاء <span class="spanReqired-w">*</span></label>
@@ -100,6 +101,7 @@
                 <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
                 <button type="button" class="btn btn-warning rightW" (click)="authSer.backFromEdit()">إلغاء</button>
             </div>
+            
           </div>
         </form>
 

src/app/dashboard/lectures/add-lecture/add-lecture.component.ts

@@ -89,33 +89,58 @@ export class AddLectureComponent implements OnInit {
   //submitted form
   onSubmitted() {
     console.log(this.lectureForm.value);
+    
     this.lectureForm.value['lecture_time'] = this.lectureForm.value['lecture_time'].split('T').join(" ");
     this.lectureForm.value['end_time'] = this.lectureForm.value['end_time'].split('T').join(" ");
     console.log(this.lectureForm.value['lecture_time']);
+
+    const startDate = this.lectureForm.value['lecture_time'].split('T')[0].split('-');
+    console.log('start date', startDate);
+    const endDate = this.lectureForm.value['end_time'].split('T')[0].split('-');
+    console.log('end date', endDate);
+
+  
+
     if(this.typeMode) {
-      this.lectureServices.editLecture(this.lectureForm.value , this.lectureId).subscribe(
-        (responce) => {
-          console.log(responce);
-          this.toastr.success('تمت التعديل بنجاح');
-          this.location.back();
-        },
-        (error) => {
-          this.toastr.error('حدث خطأ !');
-          console.log(error);
-        }
-      );
+      if(startDate[0] > endDate[0]) {
+        this.toastr.warning('سنه البدايه يجب ان تكون أكبر من سنه النهايه !');
+      } else if(startDate[0] == endDate[0] && startDate[1] > endDate[1]) {
+        this.toastr.warning('شهر البدايه يجب ان تكون أقل من شهر النهايه !');
+      } else if(startDate[0] == endDate[0] && startDate[1] > endDate[1] && startDate[2] > endDate[2]) {
+        this.toastr.warning('يوم البدايه يجب ان تكون أقل من يوم النهايه !');
+      }else {
+        this.lectureServices.editLecture(this.lectureForm.value , this.lectureId).subscribe(
+          (responce) => {
+            console.log(responce);
+            this.toastr.success('تمت التعديل بنجاح');
+            this.location.back();
+          },
+          (error) => {
+            this.toastr.error('حدث خطأ !');
+            console.log(error);
+          }
+        );
+      }
     } else {
-      this.lectureServices.addLecture(this.lectureForm.value).subscribe(
-        (responce) => {
-          console.log(responce);
-          this.toastr.success('تمت الاضافه بنجاح');
-          this.location.back();
-        },
-        (error) => {
-          this.toastr.error('حدث خطأ !');
-          console.log(error);
-        }
-      );
+      if(startDate[0] > endDate[0]) {
+        this.toastr.warning('سنه البدايه يجب ان تكون أكبر من سنه النهايه !');
+      } else if(startDate[0] == endDate[0] && startDate[1] > endDate[1]) {
+        this.toastr.warning('شهر البدايه يجب ان تكون أقل من شهر النهايه !');
+      } else if(startDate[0] == endDate[0] && startDate[1] > endDate[1] && startDate[2] > endDate[2]) {
+        this.toastr.warning('يوم البدايه يجب ان تكون أقل من يوم النهايه !');
+      }else {
+        this.lectureServices.addLecture(this.lectureForm.value).subscribe(
+          (responce) => {
+            console.log(responce);
+            this.toastr.success('تمت الاضافه بنجاح');
+            this.location.back();
+          },
+          (error) => {
+            this.toastr.error('حدث خطأ !');
+            console.log(error);
+          }
+        );
+      }
     }
   }
 

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

@@ -3,7 +3,7 @@
     <div class="row">
       <div class="col-12">
         <ul class="list-unstyled titileLi-w">
-          <li class="headingText-w">خدمه إداره المحتوي > </li>
+          <li class="headingText-w">خدمه إداره المحتوي </li>
           <li class="headingText-w activeLi-w" style="margin-right:5px"> شريط الأحداث والتفاعلات الداخليه</li>
         </ul>
       </div>
@@ -56,6 +56,7 @@
           <th>الحاله</th>
           <th>الترتيب</th>
           <th>تاريخ الإنشاء</th>
+          <th>الناشر</th>
           <th> موقع العرض</th>
           <th *ngIf="authSer.showEditBtn">تعديل</th>
         </tr>
@@ -71,16 +72,9 @@
           <td>{{lecture.name}}</td>
           <td>{{lecture.status == '0' ? 'مسوده' : lecture.status == '1' ? 'نشر' : 'not found'}}</td>
           <td>
-            {{lecture.ranking}}
-            <!-- <select class="form-control" [ngModel]="lecture.ranking" (change)="changeRanking($event, lecture.id)">
-              <option value="1">1</option>
-              <option value="2">2</option>
-              <option value="3">3</option>
-              <option value="4">4</option>
-              <option value="5">5</option>
-              <option value="6">6</option>
-            </select> -->
+            {{lecture.ranking == '10000' ? 'المزيد' : lecture.ranking }}
           </td>
+          <td>{{lecture.created_at}}</td>
           <td>{{lecture.created_by_name}}</td>
           <td>{{lecture.display_location == 'both' ? 'كلاهما' : lecture.display_location == 'internal' ? 'الصفحه الداخليه' : lecture.display_location == 'external' ? 'الصفحه الخارجيه' : 'غير موجود'}}</td>
           <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(lecture.id)"><i class="fas fa-edit"></i></button></td>

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

@@ -152,8 +152,8 @@ export class LecturesListComponent implements OnInit {
   //filtter function
   filtterFunc(data) {
     this.lecturesList = [];
-    console.log(data.target.value);
-    const dataSearch = data.target.value;     
+    const dataSearch = data.target.value;
+    console.log(dataSearch);     
     this.currentPage = 1;
     console.log('search curent page', this.currentPage);
     console.log('search page id', this.pageId);

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

@@ -5,7 +5,7 @@
           <div class="col-12">
             <ul class="list-unstyled titileLi-w">
               <li class="headingText-w">{{servicesName}} </li>
-              <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> القائمه الرئيسيه/ </li>
+              <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> القائمه الرئيسيه </li>
               <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
             </ul>
           </div>

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

@@ -173,7 +173,7 @@ export class AddMenuComponent implements OnInit {
   console.log(formData);
   if(this.checkChangeImage){
     formData['photo'] = this.imageBase64;
-    formData['photo_type'] = this.photoType[1];
+    formData['photo_type'] = this.photoType[1].toLowerCase();
   } else {
     delete formData.photo;
     delete formData.photo_type; 
@@ -184,6 +184,9 @@ export class AddMenuComponent implements OnInit {
     if(this.imageBase64 == '' && this.photoEdit == true){
       this.toastr.warning('قم باختيار صوره !');
       this.checkSaveClick = false;
+    } else if(formData.photo_type != 'png'){
+      this.toastr.warning('الصوره يجب أن تكون بصيغه png');
+      this.checkSaveClick = false;
     } else {
       if(this.serviceId == 6) {
         this.dashBoardService.editItem( this.menuId, formData, 'internalMenu').subscribe(
@@ -219,6 +222,9 @@ export class AddMenuComponent implements OnInit {
     if(this.imageBase64 == ''){
       this.toastr.warning('قم باختيار صوره !');
       this.checkSaveClick = false;
+    } else if(formData.photo_type != 'png'){
+      this.toastr.warning('الصوره يجب أن تكون بصيغه png');
+      this.checkSaveClick = false;
     } else {
       if(this.serviceId == 6){
         this.dashBoardService.addItem(formData, 'internalMainMenu').subscribe(

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

@@ -10,6 +10,7 @@
   </div>
 
   <div class="containerContent-w">
+    
     <div class="row">
         <div class="col-12 col-sm-12 col-md-6 col-lg-6">
             <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>

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

@@ -5,7 +5,7 @@
         <div class="col-12">
           <ul class="list-unstyled titileLi-w">
             <li class="headingText-w">{{serviceName}}</li>
-            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الاخبار > </li>
+            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الاخبار </li>
             <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
           </ul>
         </div>
@@ -47,7 +47,7 @@
 
               <div class="col-12 col-sm-12 col-md-4">
                 <div class="form-group">
-                  <label for="display_location" style="float: right; margin-right: 5px"> الصفحه <span class="spanReqired-w">*</span></label>
+                  <label for="display_location" style="float: right; margin-right: 5px"> البوايه <span class="spanReqired-w">*</span></label>
                   <select class="form-control" name="display_location" [ngModel]="new.display_location" id="display_location" required>
                     <option value="internal">داخليه</option>
                     <option value="external">خارجيه</option>
@@ -59,27 +59,27 @@
               <div class="col-12 col-sm-12 col-md-4">
                 <label for="status" style="float: right; margin-right: 5px">الحاله <span class="spanReqired-w">*</span></label>
                 <select class="form-control" name="status" [ngModel]="new.status" id="status" required>
-                  <option value="1">فعال</option>
-                  <option value="0">غير فعال</option>
+                  <option value="1">نشر</option>
+                  <option value="0">مسوده</option>
                 </select>
               </div>
 
               <div class="col-12 col-sm-12 col-md-12">
-                  <div class="form-group">
-                      <label for="description" style="float: right;margin-right: 5px"> الوصف باللغه العربيه <span class="spanReqired-w">*</span></label>
-                      <!-- <textarea cols="3" class="form-control" id="description" name="description" [ngModel]="new.description" required></textarea> -->
-                    <quill-editor id="description" name="description" [ngModel]="new.description" required>
-                    </quill-editor>
-                  </div>
+                <div class="form-group">
+                    <label for="description" style="float: right;margin-right: 5px"> الوصف باللغه العربيه <span class="spanReqired-w">*</span></label>
+                    <!-- <textarea cols="3" class="form-control" id="description" name="description" [ngModel]="new.description" required></textarea> -->
+                  <quill-editor id="description" name="description" [ngModel]="new.description" required>
+                  </quill-editor>
+                </div>
               </div>
 
               <div class="col-12 col-sm-12 col-md-12">
-                  <div class="form-group">
-                      <label for="description_en" style="float: right;margin-right: 5px"> الوصف باللغه الانجليزيه <span class="spanReqired-w">*</span></label>
-                      <quill-editor id="description_en" name="description_en" [ngModel]="new.description_en" required>
-                      <!-- <textarea cols="3" class="form-control" id="description_en" name="description_en" [ngModel]="new.description_en" required></textarea> -->
-                    </quill-editor>
-                  </div>
+                <div class="form-group">
+                    <label for="description_en" style="float: right;margin-right: 5px"> الوصف باللغه الانجليزيه <span class="spanReqired-w">*</span></label>
+                    <quill-editor id="description_en" name="description_en" [ngModel]="new.description_en" required>
+                    <!-- <textarea cols="3" class="form-control" id="description_en" name="description_en" [ngModel]="new.description_en" required></textarea> -->
+                  </quill-editor>
+                </div>
               </div>
 
               
@@ -98,8 +98,8 @@
                 </div>
               </div>
               <div class="col-12">
-                  <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
-                  <button type="button" class="btn btn-warning rightW" (click)="authSer.backFromEdit()" style="margin:20px 10px;">إلغاء</button>
+                <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid || checkSaveClick">حفظ</button>
+                <button type="button" class="btn btn-warning rightW" (click)="authSer.backFromEdit()" style="margin:20px 10px;">إلغاء</button>
               </div>
             </div>
           </form>

src/app/dashboard/news/add-news/add-news.component.ts

@@ -267,6 +267,7 @@ export class AddNewsComponent implements OnInit {
             (error) => {
               console.log(error);
               this.toastr.error('خطأ في التعديل !');
+              this.checkSaveClick = false;
             }
           );
         } else if(this.serviceId == 6){
@@ -278,6 +279,7 @@ export class AddNewsComponent implements OnInit {
             },
             (error) => {
               console.log(error);
+              this.checkSaveClick = false;
               this.toastr.error('خطأ في التعديل !');
             }
           );
@@ -286,6 +288,7 @@ export class AddNewsComponent implements OnInit {
     } else {
       if(this.images[0].base64 == ''){
         this.toastr.warning('قم باختيار الصوره الرئيسيه !');
+        this.checkSaveClick = false;
       } else {
 
         const images = [];
@@ -319,9 +322,9 @@ export class AddNewsComponent implements OnInit {
               this.checkSaveClick = false;
             },
             (error) => {
-              this.checkSaveClick = true;
               console.log(error);
               this.toastr.error('خطأ في الحفظ !');
+              this.checkSaveClick = false;
             }
           );
         } else if(this.serviceId == 2) {
@@ -330,12 +333,11 @@ export class AddNewsComponent implements OnInit {
               console.log(responce);
               this.toastr.success('تمت الاضافه بنجاح');
               this.location.back();
-              this.checkSaveClick = false;
             },
             (error) => {
-              this.checkSaveClick = true;
               console.log(error);
               this.toastr.error('خطأ في الحفظ !');
+              this.checkSaveClick = false;
             }
           );
         }

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

@@ -46,6 +46,7 @@ export class NewsListComponent implements OnInit {
   ngOnInit() {
 
     this.spinner.show();
+
     //init the values of permision boolean
     this.route.params.subscribe(
       (params: Params) => {
@@ -53,7 +54,6 @@ export class NewsListComponent implements OnInit {
       }
     );
 
-    this.spinner.show();
     //init the values of permision boolean
     this.authSer.showAddBtn = false;
     this.authSer.showDeleteBtn = false;
@@ -83,6 +83,7 @@ export class NewsListComponent implements OnInit {
         } else if(this.serviceId == 6) {
           this.serviceName = 'خدمه إداره المحتوي';
         }
+
         this.userSer.getPagesPermetiotns(this.userLoginId, this.serviceId).subscribe(
           (responce) => {
             console.log(responce);
@@ -116,7 +117,6 @@ export class NewsListComponent implements OnInit {
                 console.log('no events');
               }
             }
-            this.spinner.hide();
           },
           (error) => {console.log(error)}
         );
@@ -136,14 +136,16 @@ export class NewsListComponent implements OnInit {
         this.count = responce['count'];
         this.perPagePagenation = responce['per_page'];
         console.log('evennnnts', this.newsList);
-        this.spinner.hide();
+        //this.spinner.hide();
+        if(this.newsList.length > 0) {
+          this.spinner.hide();
+        }
       },
       (error) => {
         console.log(error);
         this.spinner.hide();
       }
-    );
-    
+    ); 
   }
 
     //make all checkbox of user checked 
@@ -261,7 +263,6 @@ export class NewsListComponent implements OnInit {
       console.log(this.newsListIds);
 
       if(this.newsListIds.length > 0) {
-        this.spinner.show();
         const dialogRef = this.modal.alert()
         .size('sm')
         .showClose(true)
@@ -272,12 +273,12 @@ export class NewsListComponent implements OnInit {
         .open();
         dialogRef.result
         .then( result =>  
-          
           this.dashBoardService.deleteItem(this.newsListIds, this.pageId).subscribe(
             (responce) => {
               console.log(responce);
               this.toastr.success('تم الحذف');
-              this.newsList =[];
+              this.spinner.show();
+              this.newsList = [];
               this.dashBoardService.getListData(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
                 (responce) => {
                   console.log(responce);

src/app/dashboard/statistics/statistics-list/statistics-list.component.css

@@ -0,0 +1,30 @@
+.table {
+    margin: 30px 0;
+}
+
+.dashButton-w {
+    float: right;
+    margin: 10px;
+}
+
+.custom-control-label::after,
+.custom-control-label::before {
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.fixedWidthLabel-w::after,
+.fixedWidthLabel-w::before {
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.disblayBlock-w {
+    display: block;
+}
+
+/* .centerIneerItem {
+    display: flex;
+    justify-content: center;
+    text-align: center;
+} */

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

@@ -10,20 +10,23 @@
   </div>
 
 
-  <div class="row">
-    <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-      <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
-      <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
-    </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)"/>
-        <hr>
+
+
+  <div class="containerContent-w">
+    
+    <div class="row">
+      <div class="col-12 col-sm-12 col-md-6 col-lg-6">
+        <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+        <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
+      </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)"/>
+          <hr>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="containerContent-w">
     <div class="row">
       <div class="col-12 col-sm-12 col-md-12 col-lg-6">
         <div class="form-group">

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

@@ -3,8 +3,8 @@
     <div class="row" style="margin-bottom: 30px;">
       <div class="col-12">
         <ul class="list-unstyled titileLi-w">
-          <li class="headingText-w">خدمه إداره المحتوي > </li>
-          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الملفات > </li>
+          <li class="headingText-w">خدمه إداره المحتوي  </li>
+          <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">  الملفات  </li>
           <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}} </li>
         </ul>
       </div>
@@ -79,7 +79,7 @@
             </div>
 
             <div class="col-6">
-                <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
+                <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid || checkSaveclick">حفظ</button>
                 <button type="button" class="btn btn-warning rightW" (click)="authSer.backFromEdit()">إلغاء</button>
             </div>
 

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

@@ -123,12 +123,14 @@ export class AddTabComponent implements OnInit {
   onSubmitted() {
 
     this.checkSaveclick = true;
+
     if(this.checkFileChange) {
       this.formTabData.value['file'] = this.fileData.file;
       this.formTabData.value['file_type'] = this.fileData.file_type;
     }
 
     console.log(this.formTabData.value);
+
     if(this.typeMode) {
       if(this.checkFileChange){
         if(this.formTabData.value['file']){
@@ -179,6 +181,7 @@ export class AddTabComponent implements OnInit {
         }
       );
     }
+    
   };
 
  

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

@@ -3,87 +3,89 @@
   <div class="row">
     <div class="col-12">
       <ul class="list-unstyled titileLi-w">
-        <li class="headingText-w">خدمه إداره المحتوي > </li>
+        <li class="headingText-w">خدمه إداره المحتوي  </li>
         <li class="headingText-w activeLi-w" style="margin-right:5px"> الملفات</li>
       </ul>
     </div>
   </div>
 
-  <div class="row">
-    <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-      <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
-      <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
-    </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)"/>
-        <hr>
+  <div class="containerContent-w">
+    <div class="row">
+      <div class="col-12 col-sm-12 col-md-6 col-lg-6">
+        <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button>
+        <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button>
       </div>
-    </div>
-  </div>
-
-  <div class="row">
-      <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+      <div class="col-12 col-sm-12 col-md-6 col-lg-6">
         <div class="form-group">
-          <span class="spanSelect-w">
-            <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
-              <option value="5">5</option>
-              <option value="10">10</option>
-              <option value="15">15</option>
-              <option value="20">20</option>
-            </select>
-            من العناصر يتم عرضها
-          </span>
+          <input type="text" placeholder="البحث" class="form-control inputSearchTable-w" style="margin-top:13px;" (input)="filtterFunc($event)"/>
+          <hr>
         </div>
       </div>
-      <div class="col-12 col-sm-12 col-md-12 col-lg-6">
-
-      </div>
-  </div>
-
-  <table class="table table-bordered">
-    <thead class="headBackground-w">
-      <tr>
-        <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;"></label> -->
-          </div>
-        </th>
-        <th>إسم الوثيقه</th>
-        <th>الحاله</th>
-        <th>الترتيب</th>
-        <th>النوع</th>
-        <th>التاريخ</th>
-        <th *ngIf="authSer.showEditBtn">تعديل</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr *ngFor="let tab of tabsList | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
-        <td>
-          <div class="custom-control custom-checkbox centerIneerItem">
-            <input type="checkbox" class="custom-control-input" id="{{tab.id}}" [(ngModel)]="tab.selected" [value]='tab' (change)="checkIfAllSelected();">
-            <!-- <label class="custom-control-label disblayBlock-w" for="{{tab.id}}" style="color:#2a2a2a"></label> -->
+    </div>
+  
+    <div class="row">
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+          <div class="form-group">
+            <span class="spanSelect-w" style="margin-right:10px;">
+              <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
+                <option value="5">5</option>
+                <option value="10">10</option>
+                <option value="15">15</option>
+                <option value="20">20</option>
+              </select>
+              من العناصر يتم عرضها
+            </span>
           </div>
+        </div>
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+  
+        </div>
+    </div>
+  
+    <table class="table table-bordered">
+      <thead class="headBackground-w">
+        <tr>
+          <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;"></label> -->
+            </div>
+          </th>
+          <th>إسم الوثيقه</th>
+          <th>الحاله</th>
+          <th>الترتيب</th>
+          <th>النوع</th>
+          <th>التاريخ</th>
+          <th *ngIf="authSer.showEditBtn">تعديل</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let tab of tabsList | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
+          <td>
+            <div class="custom-control custom-checkbox centerIneerItem">
+              <input type="checkbox" class="custom-control-input" id="{{tab.id}}" [(ngModel)]="tab.selected" [value]='tab' (change)="checkIfAllSelected();">
+              <!-- <label class="custom-control-label disblayBlock-w" for="{{tab.id}}" style="color:#2a2a2a"></label> -->
+            </div>
+          </td>
+          <td>{{tab.name}}</td>
+          <td>{{tab.status == '0' ? 'غير منشور' : tab.status == '1' ? 'منشور' : 'not found'}}</td>
+          <td>
+            {{ tab.ranking == '10000' ? 'المزيد' : tab.ranking }}
+            <!-- <select class="form-control" [ngModel]="tab.ranking" (change)="changeRanking($event, tab.id)">
+            <option value="1">1</option>
+            <option value="2">2</option>
+            <option value="3">3</option>
+            <option value="4">4</option>
+            <option value="5">5</option>
+            <option value="6">6</option>
+          </select> -->
         </td>
-        <td>{{tab.name}}</td>
-        <td>{{tab.status == '0' ? 'غير منشور' : tab.status == '1' ? 'منشور' : 'not found'}}</td>
-        <td>
-          {{tab.ranking}}
-          <!-- <select class="form-control" [ngModel]="tab.ranking" (change)="changeRanking($event, tab.id)">
-          <option value="1">1</option>
-          <option value="2">2</option>
-          <option value="3">3</option>
-          <option value="4">4</option>
-          <option value="5">5</option>
-          <option value="6">6</option>
-        </select> -->
-      </td>
-      <td>{{tab.type == '0' ? 'تعميم داخلي' : tab.type == '1' ? 'تعميم خارجي' : tab.type == '2' ? 'سياسات' : 'not found'}}</td>
-      <td>{{tab.created_at}}</td>
-      <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(tab.id)"><i class="fas fa-edit"></i></button></td>
-    </tr>
-  </tbody>
-</table>
-<pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
+        <td>{{tab.type == '0' ? 'تعميم داخلي' : tab.type == '1' ? 'تعميم خارجي' : tab.type == '2' ? 'سياسات' : 'not found'}}</td>
+        <td>{{tab.created_at}}</td>
+        <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(tab.id)"><i class="fas fa-edit"></i></button></td>
+      </tr>
+    </tbody>
+  </table>
+  <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
+  </div>
 </div>

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

@@ -4,8 +4,8 @@
       <div class="row">
         <div class="col-12">
           <ul class="list-unstyled titileLi-w">
-            <li class="headingText-w">خدمه الصلاحيات > </li>
-            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">{{typeFirstLink}} > </li>
+            <li class="headingText-w">خدمه الصلاحيات </li>
+            <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">{{typeFirstLink}}</li>
             <li class="headingText-w activeLi-w" style="margin-right:5px"> {{typeLink}}  </li>
           </ul>
         </div>

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

@@ -10,23 +10,37 @@
   </div>
 
 
-  <div class="row">
-    <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-      <!-- <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button> -->
-      <!-- <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button> -->
-    </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)"/>
-        <hr>
-      </div>
-    </div>
-  </div>
+
 
   <div class="containerContent-w">
+
+      <div class="row">
+        <div class="col-12 col-sm-12 col-md-6 col-lg-6" style="padding: 15px 10px;">
+          <div class="form-group">
+            <span class="spanSelect-w">
+              <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($time)">
+                <option value="5">5</option>
+                <option value="10">10</option>
+                <option value="15">15</option>
+                <option value="20">20</option>
+              </select>
+              من العناصر يتم عرضها
+            </span>
+          </div>
+          <!-- <button type="button" class="btn btn-outline-success butttonCreate dashButton-w" (click)="onAdd()" *ngIf="authSer.showAddBtn"><i class="fas fa-plus marginFontAowsome-w"></i>إنشاء جديد</button> -->
+          <!-- <button type="button" class="btn btn-outline-danger butttonDelete dashButton-w" (click)="onDelete()" *ngIf="authSer.showDeleteBtn"><i class="fas fa-times marginFontAowsome-w"></i>حذف</button> -->
+        </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)"/>
+            <hr>
+          </div>
+        </div>
+      </div>
+
     <div class="row">
       <div class="col-12 col-sm-12 col-md-12 col-lg-6">
-        <div class="form-group">
+        <!-- <div class="form-group">
           <span class="spanSelect-w">
             <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($time)">
               <option value="5">5</option>
@@ -36,7 +50,7 @@
             </select>
             من العناصر يتم عرضها
           </span>
-        </div>
+        </div> -->
       </div>
       <div class="col-12 col-sm-12 col-md-12 col-lg-6">
 

src/app/higri-date/higri-date.component.css

@@ -8,7 +8,7 @@ input,select {
     position: absolute;
     left: 16px;
     top: 32px;
-    border: 1px solid #ccc;
+    border: none;
 }
 
 ngb-datepicker-navigation-select>.custom-select {

src/app/regester/regester.component.ts

@@ -169,6 +169,9 @@ export class RegesterComponent implements OnInit {
       (responce) => {
         console.log(responce);
         this.specializations = responce['specialization'];
+      },
+      (error) => {
+        console.log(error);
       }
     );
 

src/app/servicesItems/services.component.ts

@@ -28,6 +28,7 @@ export class ServicesComponent implements OnInit {
 
     ngOnInit() {
       this.spinner.show();//spinner
+      this.authService.checkExternalFooter = false;
       //show / hide notification search in header
       this.authService.notificationLogin = true;
       this.authService.showSearchHeader = false;

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

@@ -200,9 +200,7 @@ export class AuthServiceService {
       return dayName + ' ' + date.toLocaleString(lang + '-u-ca-islamic', options);
     } else {
       return date.toLocaleString(lang + '-u-ca-islamic', options);
-
     }
-    
   }
 
 

src/app/shared/external-page.service.ts

@@ -37,5 +37,8 @@ export class ExternalPageService {
     return this.http.get(this.authSer.pathApi + '/get_contact_us/1');
   }
 
+  getExternalServices() {
+    return this.http.get(this.authSer.pathApi + '/external_services_list_web/1');
+  }
   
 }

src/app/shared/internal-page.service.ts

@@ -77,5 +77,9 @@ export class InternalPageService {
     return this.http.get(this.authSer.pathApi + '/tabs_list_internal_gate/' + currentPage + '/' + perPage + '/' + index);
   }
 
+  getInternalServices() {
+    return this.http.get(this.authSer.pathApi + '/external_services_list_web');
+  }
+
   
 }

src/styles.css

@@ -1030,7 +1030,7 @@ height: 7px !important;
   left: 0;
   height: 0;
   width: 3px;
-  background-color: #000;
+  background-color: #c39a63;
   transition: all 0.5s;
   border-radius: 20px;
 }
@@ -1041,7 +1041,7 @@ height: 7px !important;
   left: 0;
   width: 0;
   height: 3px;
-  background-color: #000;
+  background-color: #c39a63;
   transition: all 0.5s;
   border-radius: 20px;
 }
@@ -1052,7 +1052,7 @@ height: 7px !important;
   right: 0;
   width: 3px;
   height: 0;
-  background-color: #000;
+  background-color: #c39a63;
   transition: all 0.5s;
 }
 
@@ -1062,7 +1062,7 @@ height: 7px !important;
   right: 0;
   width: 0;
   height: 3px;
-  background-color: #000;
+  background-color: #c39a63;
   transition: all 0.5s;
 }