Hima 6 years ago
parent
commit
62a00a9d30

+ 8 - 3
src/app/dashboard/final-trainee-report/final-trainee-report.component.html

@@ -12,7 +12,7 @@
       </div>
   
       <div class="containerContent-w">
-        <div class="row">
+        <div class="row" id="print-section">
 
         <div class="col-12">
           <h2>مشهد التدريب</h2>
@@ -126,11 +126,16 @@
           </div>
         </div>
 
-        <div class="col-12">
-          <button class="btn btn-success" style="float: right; margin: 10px 0;" (click)="onPrint()">طباعه</button> 
+       
+
         </div>
 
+        <div class="row">
+          <div class="col-12">
+            <button class="btn btn-success" style="float: right; margin: 10px 0;" (click)="onPrint()">طباعه</button> 
+          </div>
         </div>
+
       </div>
   
   

+ 18 - 3
src/app/dashboard/final-trainee-report/final-trainee-report.component.ts

@@ -12,8 +12,23 @@ export class FinalTraineeReportComponent implements OnInit {
   ngOnInit() {
   }
 
-  onPrint() {
-    window.print();
-  }
+  onPrint(): void {
+    let printContents, popupWin;
+    printContents = document.getElementById('print-section').innerHTML;
+    popupWin = window.open('', '_blank', 'top=0,left=0,height=100%,width=auto');
+    popupWin.document.open();
+    popupWin.document.write(`
+      <html>
+        <head>
+          <title>الإعتماد النهائي للمتدرب</title>
+          <style>
+          //........Customized style.......
+          </style>
+        </head>
+    <body onload="window.print();window.close()">${printContents}</body>
+      </html>`
+    );
+    popupWin.document.close();
+}
 
 }

+ 1 - 1
src/app/dashboard/print-card-trainee/print-card-trainee-add/print-card-trainee-add.component.html

@@ -12,7 +12,7 @@
   
       <div class="containerContent-w">
 
-        <div class="row">
+        <div class="row" id="print-section">
 
           <div class="col-12 col-md-12 col-lg-6">
             <div class="card">

+ 18 - 3
src/app/dashboard/print-card-trainee/print-card-trainee-add/print-card-trainee-add.component.ts

@@ -230,9 +230,24 @@ export class PrintCardTraineeAddComponent implements OnInit {
     }
   }
 
-  onPrint() {
-    window.print();
-  }
+  onPrint(): void {
+    let printContents, popupWin;
+    printContents = document.getElementById('print-section').innerHTML;
+    popupWin = window.open('', '_blank', 'top=0,left=0,height=100%,width=auto');
+    popupWin.document.open();
+    popupWin.document.write(`
+      <html>
+        <head>
+          <title> طباعه بطاقه المتدرب</title>
+          <style>
+          //........Customized style.......
+          </style>
+        </head>
+    <body onload="window.print();window.close()">${printContents}</body>
+      </html>`
+    );
+    popupWin.document.close();
+}
 
 
 

+ 1 - 1
src/app/dashboard/reivew-trainee-data/review-trainee-add/review-trainee-add.component.html

@@ -138,7 +138,7 @@
                       <td style="position: relative;">
                         <input type="file" name="file{{i}}" id="file{{i}}" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event,i)" />
                         <label for="file{{i}}" class="iconUpload-w"><i class="fas fa-upload"></i></label>
-                        <span class="fileName-w">{{file.nameFile}}</span>
+                        <span class="fileName-w" *ngIf="file.nameFile" style="color:green">File Chossen</span>
                       </td>
                       <th *ngIf="typeMode" style="text-align:center"><a *ngIf="file.nameFile" href="{{authSer.pathImg + file.nameFile}}" target="_blank"><i class="fas fa-download"></i></a></th>
                       <td><button type="button" class="btn btn-danger form-control deleteRow-w" (click)="onDeleteRow(i)">حذف</button></td>