Commit 4765242f authored by sohail amjad's avatar sohail amjad
Browse files

added activity for diploma edit flow

2 merge requests!126New struct fix,!125New field council
Showing with 43 additions and 18 deletions
+43 -18
...@@ -309,27 +309,19 @@ ...@@ -309,27 +309,19 @@
(ngSubmit)="onNewRegCourseDetailsformSubmit(newRegCourseDetailsformGroup.value)"> (ngSubmit)="onNewRegCourseDetailsformSubmit(newRegCourseDetailsformGroup.value)">
<div class="full-details"> <div class="full-details">
<div class="applicant-details slc">
<h4>{{labels.requestType}}</h4>
<mat-form-field appearance ="outline">
<mat-label>Request Type</mat-label>
<mat-select (selectionChange)="requestTypeSelected($event)" formControlName="requestType">
<span *ngFor='let requesttype of requestTypesArray;let i = index'>
<mat-option [value]="requesttype">{{requesttype}}</mat-option>
</span>
</mat-select>
</mat-form-field>
</div>
<div class="applicant-details"> <div class="applicant-details">
<h4>{{labels.courseName}}</h4> <h4>{{labels.courseName}}</h4>
<mat-form-field appearance ="outline"> <mat-form-field appearance ="outline">
<mat-label>Course Name</mat-label> <mat-label>Course Name</mat-label>
<mat-select (selectionChange)="requestTypeSelected($event)" formControlName="courseName"> <!-- <mat-select (selectionChange)="requestTypeSelected($event)" formControlName="courseName">
<span *ngFor='let courseName of courseList;let i = index'> <span *ngFor='let courseName of courseList;let i = index'>
<mat-option [value]="courseName">{{courseName}}</mat-option> <mat-option [value]="courseName">{{courseName}}</mat-option>
</span> </span>
</mat-select> </mat-select> -->
<input matInput placeholder="course name" readonly formControlName="courseName">
</mat-form-field> </mat-form-field>
<!-- <mat-form-field appearance="outline"> <!-- <mat-form-field appearance="outline">
<input matInput placeholder="Course Name" formControlName="courseName"> <input matInput placeholder="Course Name" formControlName="courseName">
...@@ -337,6 +329,20 @@ ...@@ -337,6 +329,20 @@
</mat-form-field> --> </mat-form-field> -->
</div> </div>
<div class="applicant-details slc">
<h4>{{labels.requestType}}</h4>
<mat-form-field appearance ="outline">
<mat-label>Request Type</mat-label>
<mat-select (selectionChange)="requestTypeSelected($event)" formControlName="requestType">
<span *ngFor='let requesttype of requestTypesArray;let i = index'>
<mat-option [value]="requesttype">{{requesttype}}</mat-option>
</span>
</mat-select>
</mat-form-field>
</div>
<div class="applicant-details"> <div class="applicant-details">
<h4>{{labels.collegeName}}</h4> <h4>{{labels.collegeName}}</h4>
<mat-form-field appearance="outline"> <mat-form-field appearance="outline">
......
...@@ -100,7 +100,7 @@ export class RegnDiplomaCertDetailsComponent { ...@@ -100,7 +100,7 @@ export class RegnDiplomaCertDetailsComponent {
userRole: any; userRole: any;
userEmail: any; userEmail: any;
endPointUrl: any; endPointUrl: any;
courseList: any[] = []; courseList: any;
courseUrl: string = '' courseUrl: string = ''
paymentResponse: any; paymentResponse: any;
updateStudentBody: any; updateStudentBody: any;
...@@ -120,7 +120,7 @@ export class RegnDiplomaCertDetailsComponent { ...@@ -120,7 +120,7 @@ export class RegnDiplomaCertDetailsComponent {
isFileInputDisabled = true; isFileInputDisabled = true;
selectedLink: string = 'Candidate Details'; selectedLink: string = 'Candidate Details';
requestTypesArray = ['Original', 'Correction', 'Name change', 'Duplicate']; requestTypesArray:any[]=[];
examsBody:any; examsBody:any;
...@@ -212,7 +212,7 @@ export class RegnDiplomaCertDetailsComponent { ...@@ -212,7 +212,7 @@ export class RegnDiplomaCertDetailsComponent {
case 'StudentFromUP': case 'StudentFromUP':
this.endPointUrl = this.configService.urlConFig.URLS.STUDENT.GET_STUDENT_DETAILS this.endPointUrl = this.configService.urlConFig.URLS.STUDENT.GET_STUDENT_DETAILS
this.courseUrl = this.configService.urlConFig.URLS.STUDENT.GET_COURSES + 'DIPLOMA' this.courseUrl = this.configService.urlConFig.URLS.STUDENT.GET_COURSES + 'DIPLOMA'
this.getCourses(this.courseUrl) // this.getCourses(this.courseUrl)
break; break;
case 'Regulator': case 'Regulator':
// this.router.navigate(['claims/new-regn-cert']) // this.router.navigate(['claims/new-regn-cert'])
...@@ -1153,7 +1153,26 @@ export class RegnDiplomaCertDetailsComponent { ...@@ -1153,7 +1153,26 @@ export class RegnDiplomaCertDetailsComponent {
onEditClick(){ onEditClick(){
this.newRegCertDetailsformGroup.enable(); this.newRegCertDetailsformGroup.enable();
this.newRegCourseDetailsformGroup.enable(); this.newRegCourseDetailsformGroup.enable();
// this.newRegCourseDetailsformGroup.get('courseName')?.disable()
this.isFileInputDisabled = false; this.isFileInputDisabled = false;
this.getActivity()
}
getActivity(){
let request = {
"councilName": this.stateData.councilName,
"entityName": 'StudentFromUP',
"courseType": 'Diploma',
"courseName": this.candetails.courseName
}
this.baseService.fetchActivity(request).subscribe({
next:(res)=>{
this.requestTypesArray = res.responseData
},
error:(err)=>{
console.log(err)
}
})
} }
onProfileChanged(event?:any){ onProfileChanged(event?:any){
let selectedUploadFile = event.target.files[0]; let selectedUploadFile = event.target.files[0];
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
"GET_COURSES_OUTSIDE":"api/v1/allcourse/StudentFromUP", "GET_COURSES_OUTSIDE":"api/v1/allcourse/StudentFromUP",
"DOWNLOAD_CREDENTIALS":"api/v2/", "DOWNLOAD_CREDENTIALS":"api/v2/",
"DOWNLOAD_CREDENTIALS_v3":"api/v3/", "DOWNLOAD_CREDENTIALS_v3":"api/v3/",
"DOWNLOAD_CREDENTIALS_DIPLOMA":"api/v3/DiplomaFromUP/", "DOWNLOAD_CREDENTIALS_DIPLOMA":"api/v1/DiplomaFromUP/",
"GET_DIPLOMA_DETAILS":"api/v1/DiplomaFromUP/search", "GET_DIPLOMA_DETAILS":"api/v1/DiplomaFromUP/search",
"DIPLOMA_PAYMENT":"claim-ms/api/v1/Payment", "DIPLOMA_PAYMENT":"claim-ms/api/v1/Payment",
"STUDENT_OSID":"api/v1/StudentFromUP/search", "STUDENT_OSID":"api/v1/StudentFromUP/search",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment