fff

src/app/Internal-Page/internal-page-content/internal-page-content.component.html

@@ -19,6 +19,7 @@
                                     </a>
                                 </div>
                             </div>
+                        </div>
 
                         <div class="col-12 col-md-8 order-1 order-sm-1 order-md-2">
                             <div class="slider"> 
@@ -37,10 +38,10 @@
                                 </div>
                             </div>
                         </div> 
-                    </div>
+                     </div>
                 </div>
             </div>
-                       
+                        
 
             <div class="eventPart-w">
                 <div class="container containerPaddingEdit-w">
@@ -59,89 +60,90 @@
                     </div>
                 </div>
 
-            <div class="contentsData-w">
-                <div class="container containerPaddingEdit-w">
-                    <div class="row">
-                        <div class="col-12 col-sm-12 col-md-4 editRowPadding-w">
-                            <div class="joinUs-w">
-
-                                <div class="joinHeader-w">
-                                    إنضم إلينا
-                                </div>
-
-                                <div class="joinHeading-w">
-                                    <h2>ترحيب بالإنضمام للمجمع الطبي</h2>
-                                </div>
+                <div class="contentsData-w">
+                    <div class="container containerPaddingEdit-w">
+                        <div class="row">
+                            <div class="col-12 col-sm-12 col-md-4 editRowPadding-w">
+                                <div class="joinUs-w">
 
-                                <div class="dataContent">
-                                    <div class="row">                                         
-                                        <div id="demo" class="carousel slide" data-ride="carousel">
-                                            <ul class="carousel-indicators">
-                                                <li *ngFor="let join of joinUs; let i = index" data-target="#demo" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
-                                            </ul>
-                                            <div class="carousel-inner">
-                                                <div class="carousel-item" *ngFor="let join of joinUs; let i = index" [ngClass]="i == 0 ? 'active' : ''">
-                                                    <div class="carousel-caption">
-                                                        <img src="{{authSer.pathImg + join.photo}}" />
-                                                        <p><span>{{join.name}}</span></p>
-                                                        <p>  <span>{{join.adminstration_name ? join.adminstration_name : 'not found'}}</span></p>
-                                                        <p> <span>{{join.date_of_employment_hij ? join.date_of_employment_hij : 'not found'}}</span></p>
-                                                    </div>   
-                                                </div>
-                                            </div>
-                                        </div>
+                                    <div class="joinHeader-w">
+                                        إنضم إلينا
                                     </div>
-                                </div>
 
-                            </div>
-                        </div>
+                                    <div class="joinHeading-w">
+                                        <h2>ترحيب بالإنضمام للمجمع الطبي</h2>
+                                    </div>
 
-                        <div class="col-12 col-md-8 editRowPadding-w">
-                            <div class="sharingEvent-w">
-                                <div class="sharingHeader-w">
-                                    <h2>مشاركه اللحظات</h2>
-                                </div>
-                                <div class="row">
-                                    <div class="col-12 col-md-6" style="padding-left:5px">
-                                        <div class="congeratolation">
-                                            <h2>التهانى</h2>
-                                        </div>
-                                        <div class="content">
-                                            <div id="demo1" class="carousel slide" data-ride="carousel">
+                                    <div class="dataContent">
+                                        <div class="row">                                         
+                                            <div id="demo" class="carousel slide" data-ride="carousel">
                                                 <ul class="carousel-indicators">
-                                                    <li *ngFor="let conga of congratulations; let i = index" data-target="#demo1" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
+                                                    <li *ngFor="let join of joinUs; let i = index" data-target="#demo" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
                                                 </ul>
                                                 <div class="carousel-inner">
-                                                    <div class="carousel-item" *ngFor="let conga of congratulations; let i = index" [ngClass]="i == 0 ? 'active' : ''">
+                                                    <div class="carousel-item" *ngFor="let join of joinUs; let i = index" [ngClass]="i == 0 ? 'active' : ''">
                                                         <div class="carousel-caption">
-                                                            <p><span>{{conga.employee_name}}</span></p>
-                                                            <p class="event">{{conga.name}}</p>
-                                                            <p>{{conga.created_at}}</p>
+                                                            <img src="{{authSer.pathImg + join.photo}}" />
+                                                            <p><span>{{join.name}}</span></p>
+                                                            <p>  <span>{{join.adminstration_name ? join.adminstration_name : 'not found'}}</span></p>
+                                                            <p> <span>{{join.date_of_employment_hij ? join.date_of_employment_hij : 'not found'}}</span></p>
                                                         </div>   
                                                     </div>
                                                 </div>
-                                            </div> 
+                                            </div>
                                         </div>
                                     </div>
-                                    <div class="col-12 col-md-6" style="padding-right:5px">
-                                        <div class="sadDead-w">
-                                            <h2>التعازى</h2>
+
+                                </div>
+                            </div>
+
+                            <div class="col-12 col-md-8 editRowPadding-w">
+                                <div class="sharingEvent-w">
+                                    <div class="sharingHeader-w">
+                                        <h2>مشاركه اللحظات</h2>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-12 col-md-6" style="padding-left:5px">
+                                            <div class="congeratolation">
+                                                <h2>التهانى</h2>
+                                            </div>
+                                            <div class="content">
+                                                <div id="demo1" class="carousel slide" data-ride="carousel">
+                                                    <ul class="carousel-indicators">
+                                                        <li *ngFor="let conga of congratulations; let i = index" data-target="#demo1" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
+                                                    </ul>
+                                                    <div class="carousel-inner">
+                                                        <div class="carousel-item" *ngFor="let conga of congratulations; let i = index" [ngClass]="i == 0 ? 'active' : ''">
+                                                            <div class="carousel-caption">
+                                                                <p><span>{{conga.employee_name}}</span></p>
+                                                                <p class="event">{{conga.name}}</p>
+                                                                <p>{{conga.created_at}}</p>
+                                                            </div>   
+                                                        </div>
+                                                    </div>
+                                                </div> 
+                                            </div>
                                         </div>
-                                        <div class="content">    
-                                            <div id="demo2" class="carousel slide" data-ride="carousel">
-                                                <ul class="carousel-indicators">
-                                                    <li *ngFor="let cond of condolences; let i = index" data-target="#demo2" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
-                                                </ul>
-                                                <div class="carousel-inner">
-                                                    <div class="carousel-item" *ngFor="let cond of condolences; let i = index" [ngClass]="i == 0 ? 'active' : ''">
-                                                        <div class="carousel-caption">
-                                                            <p><span>{{cond.employee_name}}</span></p>
-                                                            <p class="event">{{cond.name}}</p>
-                                                            <p>{{cond.created_at}}</p>
-                                                        </div>   
+                                        <div class="col-12 col-md-6" style="padding-right:5px">
+                                            <div class="sadDead-w">
+                                                <h2>التعازى</h2>
+                                            </div>
+                                            <div class="content">    
+                                                <div id="demo2" class="carousel slide" data-ride="carousel">
+                                                    <ul class="carousel-indicators">
+                                                        <li *ngFor="let cond of condolences; let i = index" data-target="#demo2" [attr.data-slide-to]="i" [ngClass]="i == 0 ? 'active' : ''"></li>
+                                                    </ul>
+                                                    <div class="carousel-inner">
+                                                        <div class="carousel-item" *ngFor="let cond of condolences; let i = index" [ngClass]="i == 0 ? 'active' : ''">
+                                                            <div class="carousel-caption">
+                                                                <p><span>{{cond.employee_name}}</span></p>
+                                                                <p class="event">{{cond.name}}</p>
+                                                                <p>{{cond.created_at}}</p>
+                                                            </div>   
+                                                        </div>
                                                     </div>
-                                                </div>
-                                            </div>  
+                                                </div>  
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -150,7 +152,7 @@
                     </div>
                 </div>
             </div>
-         
+            
             <div class="secondServices-w">
                 <div class="container containerPaddingEdit-w" style="height:560px; overflow-y:auto">
                     <div class="row" style="padding:0 10px;">
@@ -175,8 +177,8 @@
                         </div>
                     </div>
                 </div>
-            </div>
-            
+             </div>
+                
             <div class="tabs">
                 <div class="container containerPaddingEdit-w">
                     <div class="row">
@@ -233,11 +235,9 @@
                         </div>
                     </div>
                 </div>
-            </div>
+            </div>    
         </div>
-    </div>
-</div>
-</div> 
+    </div> 
 </ng-template>
 
 

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

@@ -18,17 +18,11 @@ import { UserService } from '../../shared/user.service';
 })
 export class InternalPageComponent implements OnInit {
 
-  constructor(private authSer: AuthServiceService, 
-    private router:Router, 
-    private userservice: UserService, 
-    private route: ActivatedRoute,
-    private internalService: InternalPageService,
-    private spinner: NgxSpinnerService) {
-      spinner.show();
+  constructor(private authSer: AuthServiceService, private spinner: NgxSpinnerService) {
+      this.spinner.show();
      }
 
     myInnerHeight = window.innerHeight;
-   externalServices = [];
 
 
 

src/app/Internal-Page/internal-routing-module.ts

@@ -21,11 +21,11 @@ const internalPageRoutes: Routes = [
         {path:'circulars', component: CircularsPageComponent},
         {path: 'events', component: EventsDateComponent},
         {path: 'newpages', component: NewsPagesComponent},
+        {path: ':typePage', component: HospitalContentComponent},
         {path: 'contactUs/:contactId', component: InternalContactUsComponent},
         {path: 'policy/:policyId', component: InternalPolicyComponent},
         {path: 'externalServiceDetails/:serviceId', component: ExternalServiceDetailsComponent},
         {path: 'news/:reportId', component: NewsPageComponent},
-        {path: ':typePage', component: HospitalContentComponent},
     ]},
 ];