Merge pull request #22 from KB-iGOT/mentorship-changes

update for 6663 6665
KB-iGOT · Sep 4, 2024 · e5f7c92 · e5f7c92
2 parents dff6523 + a20059e
commit e5f7c92
Showing 1 changed file with 22 additions and 14 deletions.
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -323,24 +323,25 @@
               </div>
             </div>
             <!-- Cader Related Code-->
+
             <div class="flex flex-row margin-top-m">
-              <div class="md:w-1/3">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.hasOwnProperty('cadreDetails')">
                 <label class="margin-remove-bottom form-label">Are you a Cadre Employee?</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
-                    [value]="user?.profileDetails?.cadreDetails ? 'Yes': 'No'">
+                    [value]="user?.profileDetails?.cadreDetails?.civilServiceType ? 'Yes': 'No'">
                 </mat-form-field>
               </div>
 
-              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
                 <label class="margin-remove-bottom form-label">Type of Civil Service</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
                     [value]="user?.profileDetails?.cadreDetails?.civilServiceType ? user?.profileDetails?.cadreDetails?.civilServiceType: ''">
                 </mat-form-field>
               </div>
 
-              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
                 <label class="margin-remove-bottom form-label">Service</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
@@ -349,23 +350,26 @@
               </div>
             </div>
             <div class="flex flex-row margin-top-m">
-              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType &&
+              (user?.profileDetails?.cadreDetails?.civilServiceName.trim() === 'Indian Administrative Office (IAS)' ||
+            user?.profileDetails?.cadreDetails?.civilServiceName.trim() === 'Indian Police Service (IPS)' ||
+            user?.profileDetails?.cadreDetails?.civilServiceName.trim() === 'Indian Forest Service (IFoS)')">
                 <label class="margin-remove-bottom form-label">Cadre</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
                     [value]="user?.profileDetails?.cadreDetails?.cadreName ? user?.profileDetails?.cadreDetails?.cadreName: ''">
                 </mat-form-field>
               </div>
 
-              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
                 <label class="margin-remove-bottom form-label">Batch</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
                     [value]="user?.profileDetails?.cadreDetails?.cadreBatch ? user?.profileDetails?.cadreDetails?.cadreBatch: ''">
                 </mat-form-field>
               </div>
 
-              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
                 <label class="margin-remove-bottom form-label">Cadre Controlling Authority</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
@@ -597,41 +601,45 @@
           </div>
           <!-- Cader Related Code-->
           <div class="flex flex-row margin-top-m">
-            <div class="md:w-1/4">
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.hasOwnProperty('cadreDetails')">
               <label class="view-text-label">Are you a Cadre Employee?</label>
-              <p>{{user?.profileDetails?.cadreDetails ? 'Yes': 'No'}}</p>
+              <p>{{user?.profileDetails?.cadreDetails?.civilServiceType ? 'Yes': 'No'}}</p>
             </div>
 
-            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails">
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
               <label class="view-text-label">Type of Civil Service</label>
               <p>{{user?.profileDetails?.cadreDetails?.civilServiceType ?
                 user?.profileDetails?.cadreDetails?.civilServiceType: '-'}}</p>
 
             </div>
 
-            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails">
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
               <label class="view-text-label">Service</label>
               <p>{{user?.profileDetails?.cadreDetails?.civilServiceName ?
                 user?.profileDetails?.cadreDetails?.civilServiceName: '-'}}</p>
 
             </div>
-            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails">
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType &&
+            (user?.profileDetails?.cadreDetails?.civilServiceName.trim() === 'Indian Administrative Office (IAS)' ||
+            user?.profileDetails?.cadreDetails?.civilServiceName.trim() === 'Indian Police Service (IPS)' ||
+            user?.profileDetails?.cadreDetails?.civilServiceName.trim() === 'Indian Forest Service (IFoS)')
+            ">
               <label class="view-text-label">Cadre</label>
               <p>{{user?.profileDetails?.cadreDetails?.cadreName ? user?.profileDetails?.cadreDetails?.cadreName: '-'}}
               </p>
 
             </div>
           </div>
           <div class="flex flex-row margin-top-m">
-            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails">
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
               <label class="view-text-label">Batch</label>
               <p>{{user?.profileDetails?.cadreDetails?.cadreBatch ? user?.profileDetails?.cadreDetails?.cadreBatch:
                 '-'}}
               </p>
 
             </div>
 
-            <div class="md:w-1/2" *ngIf="user?.profileDetails?.cadreDetails">
+            <div class="md:w-1/2" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
               <label class="view-text-label">Cadre Controlling Authority</label>
               <p>{{user?.profileDetails?.cadreDetails?.cadreControllingAuthorityName ?
                 user?.profileDetails?.cadreDetails?.cadreControllingAuthorityName: '-'}}</p>