Skip to content

Commit

Permalink
bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Ancy Riju authored and Ancy Riju committed Jun 7, 2024
1 parent c1c6cd1 commit 421eb05
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 97 deletions.
51 changes: 0 additions & 51 deletions src/app/app-modules/registrar/health-id-otp-generation/health-id-otp-generation.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ export class HealthIdOtpGenerationComponent implements OnInit, DoCheck {
(res: any) => {
if (res.statusCode === 200 && res.data) {
this.registrarService.abhaGenerateData = res.data;
this.registrarService.aadharNumberNew = this.aadharNum;
this.registrarService.getabhaDetail(true);

const dialogRefSuccess = this.dialog.open(
Expand Down Expand Up @@ -312,46 +311,6 @@ export class HealthIdOtpGenerationComponent implements OnInit, DoCheck {
genderID = filteredGender[0].genderID;
genderName = filteredGender[0].genderName;
}
// let stateID: any;
// let stateName: any;
// let matchedState;
// let matchedDistrict;
// let districtID: any;
// let districtName: any;
// const location = JSON.parse(
// localStorage.getItem('location') as any,
// );
// location.stateMaster.forEach((item: any) => {
// if (item.govtLGDStateID === res.data.stateCode) {
// matchedState = item;
// stateID = matchedState.stateID;
// stateName = matchedState.stateName;

// this.registrarService
// .getDistrictList(stateID)
// .subscribe((resp: any) => {
// if (resp && resp.statusCode === 200) {
// const districtList = resp.data;
// this.registrarService.updateDistrictList(districtList);
// resp.data.forEach((item: any) => {
// if (
// item.govtLGDDistrictID === res.data.districtCode
// ) {
// matchedDistrict = item;
// districtID = matchedDistrict.districtID;
// districtName = matchedDistrict.districtName;
// }
// });
// this.registrarService
// .getSubDistrictList(districtID)
// .subscribe((res: any) => {
// if (res && res.statusCode === 200) {
// const subDistrictList = res.data;
// this.registrarService.updateSubDistrictList(
// subDistrictList,
// );
// }
// });

const dat = {
healthIdNumber: res.data.healthIdNumber,
Expand All @@ -362,19 +321,9 @@ export class HealthIdOtpGenerationComponent implements OnInit, DoCheck {
dob: dob,
gender: genderID,
genderName: genderName,
// "stateID": res.data.stateCode,
// "stateName": res.data.stateName,
// stateID: stateID,
// stateName: stateName,
// districtID: districtID,
// districtName: districtName,
};
this.registrarService.setHealthIdMobVerification(dat);
this.dialogRef.close(dat);
// }
// });
// }
// });
});
} else {
this.showProgressBar = false;
Expand Down
13 changes: 1 addition & 12 deletions ...modules/registrar/registration/register-other-details/register-other-details.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,6 @@ export class RegisterOtherDetailsComponent
}
}
}

const formGroupIndexed = <FormGroup>id.at(0);
formGroupIndexed.patchValue({
type: aadharId,
idValue: this.registrarService.aadharNumberNew,
allow: this.getAllowedGovChars(aadharId),
});
}

ngDoCheck() {
Expand Down Expand Up @@ -927,11 +920,7 @@ export class RegisterOtherDetailsComponent
}
}
}
if (c > 1 || c === 0 || cflag)
this.confirmationService.alert(
this.currentLanguageSet.validHealthIDMessage,
'error',
);
if (c > 1 || c === 0 || cflag) console.log('print data');
}
if (healthidval && c === 1 && !cflag) {
this.openDialogForValidate();
Expand Down
41 changes: 24 additions & 17 deletions ...registrar/registration/register-personal-details/register-personal-details.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,29 +210,36 @@
</div>

<div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 box">
<mat-form-field [style.width]="'96%'">
<mat-icon matSuffix>event</mat-icon>
<mat-label class="mat-label-text">{{
<mat-form-field
[style.width]="'96%'"
class="mat_form_field_width_one"
>
<mat-label>{{
current_language_set?.ro?.personalInfo?.dob
}}</mat-label>
<input
autocomplete="off"
readonly="true"
matInput
id="dob-input"
[(ngModel)]="dateForCalendar"
type="text"
#dobval
(onHidden)="dobChangeByCalender(dobval.value)"
(change)="dobChangeByCalender(dobval.value)"
[bsConfig]="bsConfig"
[minDate]="minDate"
[maxDate]="today"
#dp="bsDatepicker"
maxlength="10"
bsDatepicker
name="dob"
formControlName="dob"
[min]="minDate"
[max]="today"
[matDatepicker]="dobPicker"
required
ng-readonly="true"
autocomplete="off"
#dobval
id="dob-input"
type="text"
(dateInput)="dobChangeByCalender(dobval.value)"
(dateChange)="dobChangeByCalender(dobval.value)"
/>
<mat-hint>MM/DD/YYYY</mat-hint>
<mat-datepicker-toggle
matSuffix
[for]="dobPicker"
></mat-datepicker-toggle>
<mat-datepicker #dobPicker></mat-datepicker>
</mat-form-field>
</div>

Expand Down Expand Up @@ -300,7 +307,7 @@
autocomplete="off"
matInput
allowText="number"
(selectionChange)="checkAgeAtMarriage()"
(change)="checkAgeAtMarriage()"
[required]="enableMarriageDetails"
formControlName="ageAtMarriage"
minlength="2"
Expand Down
2 changes: 1 addition & 1 deletion ...s/registrar/registration/register-personal-details/register-personal-details.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ export class RegisterPersonalDetailsComponent
console.log(this.personalDetailsForm.value.dob);
if (
this.dateForCalendar &&
(!dobval || dobval.length === 10) &&
(dobval || dobval.length === 10) &&
this.personalDetailsForm.controls['dob'].valid
) {
const dateDiff = Date.now() - date.getTime();
Expand Down
8 changes: 0 additions & 8 deletions src/app/app-modules/registrar/registration/registration.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -686,10 +686,6 @@ export class RegistrationComponent
}
}
if (c > 1 || c === 0 || cflag) {
this.confirmationService.alert(
this.currentLanguageSet.validHealthIDMessage,
'error',
);
return false;
}
}
Expand Down Expand Up @@ -782,10 +778,6 @@ export class RegistrationComponent
} else {
if (healthid) {
if (!this.disableGenerateOTP) {
this.confirmationService.alert(
this.currentLanguageSet.validHealthIDMessage,
'info',
);
otherDetailsForm.controls['healthId'].patchValue(null);
return false;
} else {
Expand Down
16 changes: 8 additions & 8 deletions src/environments/environment.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
// `ng build --env=prod` then `environment.prod.ts` will be used instead.
// The list of which env maps to which file can be found in `.angular-cli.json`.

const commonIP = 'http://183.82.107.186:8080';
const tmIP = 'http://183.82.107.186:8080';
const IP104 = 'http://183.82.107.186:8080';
const mmuIP = 'http://183.82.107.186:8080';
const schedulerIP = 'http://183.82.107.186:8080';
const adminIP = 'http://183.82.107.186:8080';
const FHIRIP = 'http://183.82.107.186:8080';
const inventoryUI_IP = 'http://183.82.107.186:8080';
const commonIP = 'https://amritwprdev.piramalswasthya.org';
const tmIP = 'https://amritwprdev.piramalswasthya.org';
const IP104 = 'https://amritwprdev.piramalswasthya.org';
const mmuIP = 'https://amritwprdev.piramalswasthya.org';
const schedulerIP = 'https://amritwprdev.piramalswasthya.org';
const adminIP = 'https://amritwprdev.piramalswasthya.org';
const FHIRIP = 'https://amritwprdev.piramalswasthya.org';
const inventoryUI_IP = 'https://amritwprdev.piramalswasthya.org';

const SERVER_IP = '10.208.122.39';

Expand Down

0 comments on commit 421eb05

Please sign in to comment.