Skip to content

AMM-1603 Edit Indent Request changes #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
helenKaryamsetty merged 14 commits into from
Jun 25, 2025
Merged

AMM-1603 Edit Indent Request changes #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3c2cec6
fix: dispense screen changes
devikasuresh20 Jun 10, 2025
5f11197
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Jun 10, 2025
3ac9072
fix: hwc to aam changes
devikasuresh20 Jun 10, 2025
6ccff9e
fix: hwc to aam changes
devikasuresh20 Jun 10, 2025
a8cc5a2
Merge branch 'develop' of https://github.com/devikasuresh20/HWC-Inven…
devikasuresh20 Jun 10, 2025
049f3e5
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Jun 10, 2025
57d0da6
commonui commit changes
devikasuresh20 Jun 10, 2025
6cd54eb
Merge branch 'develop' of https://github.com/devikasuresh20/HWC-Inven…
devikasuresh20 Jun 10, 2025
f493ff5
adding commonui
devikasuresh20 Jun 10, 2025
ca0e71d
Merge branch 'develop' of https://github.com/devikasuresh20/HWC-Inven…
devikasuresh20 Jun 10, 2025
a6345c3
Merge branch 'develop' of https://github.com/devikasuresh20/HWC-Inven…
devikasuresh20 Jun 17, 2025
188d523
fix: edit indent screen changes
devikasuresh20 Jun 25, 2025
efd67a7
Merge branch 'develop' of https://github.com/devikasuresh20/HWC-Inven…
devikasuresh20 Jun 25, 2025
5cd50b8
update commonui submodule to latest commit
devikasuresh20 Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Common-UI
Open in desktop
Submodule Common-UI updated 2 files
+8 −0 src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.ts
+9 −1 src/registrar/registration/registration.component.ts
13 changes: 5 additions & 8 deletions ...der-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
</mat-form-field>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
<mat-form-field
[style.width]="'100%'"
>
<mat-form-field [style.width]="'100%'">
<mat-label>
{{ currentLanguageSet?.inventory?.referenceNo }}
</mat-label>
Expand All @@ -45,9 +43,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
</mat-form-field>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
<mat-form-field
[style.width]="'100%'"
>
<mat-form-field [style.width]="'100%'">
<mat-label>
{{ currentLanguageSet?.inventory?.reason }}
</mat-label>
Expand Down Expand Up @@ -270,9 +266,9 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
<button
type="button"
mat-raised-button
color="accent mat_green"
class="pull-right m-r-5"
color="accent"
*ngIf="editMode"
class="pull-right m-r-5 mat_green"
[disabled]="indentRequestForm.invalid"
(click)="updateIndentRequest(indentRequestForm)"
>
Expand All @@ -281,6 +277,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
<button
type="button"
mat-raised-button
*ngIf="editMode"
color="primary"
class="pull-right m-r-5"
[disabled]="indentRequestForm.pristine"
Expand Down
2 changes: 1 addition & 1 deletion ...order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export class IndentRequestComponent implements OnInit, DoCheck {
indentID: this.dataStorageService.indentDetails.indentID,
fromFacilityID: this.dataStorageService.indentDetails.fromFacilityID,
};
if (this.viewItemReqObj !== undefined || this.viewItemReqObj !== null) {
if (this.viewItemReqObj !== undefined && this.viewItemReqObj !== null) {
this.editMode = true;
this.getItemList(this.viewItemReqObj);
} else {
Expand Down
10 changes: 5 additions & 5 deletions src/environments/environment.prod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ const FHIRIP = "https://amritwprdev.piramalswasthya.org/";
// const INVENTORY_API = `http://${IP}:8080/apiman-gateway/IEMR/Inventory/1.0/`;
// const MMU_API = `http://${IP}:8080/apiman-gateway/IEMR/MMU/1.0/`;

const COMMON_API_OPEN = `${commonIP}commonapi-v1.0/`;
const COMMON_API = `${commonIP}commonapi-v1.0/`;
const INVENTORY_API = `${inventoryIP}Inventoryapi-v1.0/`;
const MMU_API = `${mmuIP}mmuapi-v1.0/`;
const FHIR_API = `${FHIRIP}fhirapi-v1.0/`;
const COMMON_API_OPEN = `${commonIP}common-api/`;
const COMMON_API = `${commonIP}common-api/`;
const INVENTORY_API = `${inventoryIP}inventory-api/`;
const MMU_API = `${mmuIP}mmu-api/`;
const FHIR_API = `${FHIRIP}fhir-api/`;
const sessionStorageEncKey = '';
const siteKey = '';
const captchaChallengeURL = '';
Expand Down
10 changes: 5 additions & 5 deletions src/environments/environment.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ const FHIRIP = "https://amritwprdev.piramalswasthya.org/";
// const INVENTORY_API = `http://${IP}:8080/apiman-gateway/IEMR/Inventory/1.0/`;
// const MMU_API = `http://${IP}:8080/apiman-gateway/IEMR/MMU/1.0/`;

const COMMON_API_OPEN = `${commonIP}commonapi-v1.0/`;
const COMMON_API = `${commonIP}commonapi-v1.0/`;
const INVENTORY_API = `${inventoryIP}Inventoryapi-v1.0/`;
const MMU_API = `${mmuIP}mmuapi-v1.0/`;
const FHIR_API = `${FHIRIP}fhirapi-v1.0/`;
const COMMON_API_OPEN = `${commonIP}common-api/`;
const COMMON_API = `${commonIP}common-api/`;
const INVENTORY_API = `${inventoryIP}inventory-api/`;
const MMU_API = `${mmuIP}mmu-api/`;
const FHIR_API = `${FHIRIP}fhir-api/`;
const sessionStorageEncKey = '';

export const environment = {
Expand Down
Loading