Skip to content
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.

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

Merging develop to main #1

Open
wants to merge 110 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
3834ee7
customization registration code
May 22, 2024
e05dd7b
minor change
May 22, 2024
0e7aa20
additional cxhanges
May 23, 2024
63f170a
CSS fixes for the registration
bhpratibha May 23, 2024
81cbef6
CSS fixes for the registration
bhpratibha May 24, 2024
12a6d65
rollback to mat stepper changes
bhpratibha May 27, 2024
928fe24
added css changes to the registration
bhpratibha May 27, 2024
def4958
reqObj and date field changes
May 28, 2024
1afba96
search functionality changes
May 28, 2024
1a27a98
edit beneficiary changes
Jun 2, 2024
b0b6231
minor change
Jun 2, 2024
00c4c10
updated methods
Jun 4, 2024
5ac906a
import changes
Jun 4, 2024
c698979
resolved merge conflicts
Jun 4, 2024
07872b3
abha changes for hwc
Jun 4, 2024
ffb78e4
resolved merge conflict
Jun 4, 2024
d98260a
commented fields
Jun 4, 2024
c6a6696
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
Jun 4, 2024
49f257d
some errors resolution
Jun 4, 2024
1ec2234
shared module path change
Jun 5, 2024
cc049ed
minor changes
Jun 5, 2024
c675169
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
Jun 5, 2024
edfdfb9
registration save reqobj changes
Jun 5, 2024
cc834cc
age changes
Jun 6, 2024
539f10d
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
Jun 6, 2024
d795b15
registration reqobj changes
Jun 6, 2024
4a276fb
small change for family tagging service
Jun 6, 2024
7f72dc1
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
Jun 6, 2024
917c0f0
CSS Changes
NKOKKILIGADDA87 Jun 6, 2024
faa6442
CSS changes
NKOKKILIGADDA87 Jun 6, 2024
b2ee6f4
validator changes
Jun 6, 2024
c68f675
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
Jun 6, 2024
607b76a
Change in reqObj for pincode in registation
Jun 7, 2024
e3723f1
Request object change in update logic
Jun 7, 2024
d30470d
Chnages in registartion component for patching issue
Jun 10, 2024
d7118bd
resolved gender patch issue for registartion
Jun 10, 2024
6ea3c64
abha and consent popupchanges
Jun 13, 2024
6ac78f8
minor location change
Jun 13, 2024
9058bb1
CSS CHNAGES
NKOKKILIGADDA87 Jun 18, 2024
a44e248
CSS CHNAGES
NKOKKILIGADDA87 Jun 18, 2024
9536cbf
CSS Changes
NKOKKILIGADDA87 Jun 19, 2024
165e6e8
minor radio button changes
Jun 25, 2024
ee67f70
CSS changes
NKOKKILIGADDA87 Jun 27, 2024
c3f6ff3
CSS changes
NKOKKILIGADDA87 Jun 27, 2024
125c2b5
CSS Changes
NKOKKILIGADDA87 Jun 28, 2024
5f59d70
Change in logic for loops of agent field
Jul 3, 2024
d54d58d
fix in brother filed as non-mandatory as isRequired is not there
Jul 15, 2024
ce0d529
date issue fix and search and css change in personal form
Jul 16, 2024
75751ee
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
Jul 16, 2024
31b04cd
search issue and css change
Jul 16, 2024
6e2ec4c
change in html for isRequired not coming from admin
Jul 16, 2024
0e11f5c
change in html for isRequired is not coming from admin in mmu
Jul 16, 2024
505a4a8
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
Jul 16, 2024
4189e2a
Added validation for age at marriage field in registration
Jul 17, 2024
718e2ab
search no records found and care context linking code changes
Jul 18, 2024
5ac85c9
merge conflicts resolved
Jul 18, 2024
ffd662b
search table changes
Jul 18, 2024
50302e0
Changes for patching abha number
Jul 18, 2024
607d39b
search id changes
Jul 18, 2024
c7c31b9
health id table header change
Jul 18, 2024
69148e5
Abha generation code for otherlocation
Jul 19, 2024
93850f6
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
Jul 19, 2024
409cd72
CSS Changes
NKOKKILIGADDA87 Jul 22, 2024
13e6412
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
NKOKKILIGADDA87 Jul 22, 2024
894bb32
CSS Changes
NKOKKILIGADDA87 Jul 22, 2024
8589745
Code changes for abha generation mode in hwc
Jul 24, 2024
e7b6917
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
Jul 24, 2024
8ad415a
Added readonly to abha
Jul 24, 2024
c97693c
CSS changes
NKOKKILIGADDA87 Jul 24, 2024
96cdc46
CSS changes
NKOKKILIGADDA87 Jul 24, 2024
30ed919
css changes tried
Jul 25, 2024
a54b8b8
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
Jul 25, 2024
84dea47
biometric changes
Jul 26, 2024
971b3d1
merge conflicts resolved
Jul 26, 2024
9fe5dd1
Change in request object for genderID
Jul 26, 2024
91bcf6f
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
Jul 26, 2024
7dd779e
abha bio changes
Jul 31, 2024
6c8150d
CSS changes
NKOKKILIGADDA87 Jul 31, 2024
a314c1b
Merge branch 'develop' of https://github.com/PSMRI/Common-UI into dev…
NKOKKILIGADDA87 Jul 31, 2024
922ce22
Paginator issue resolved for search in registartion
Aug 2, 2024
cf54ed5
CSS Chnages
NKOKKILIGADDA87 Aug 2, 2024
acea6ec
change in code for patching of age unit in calender
Aug 5, 2024
c09bcf5
Corrected the logic for agenUnits as per date change
Aug 5, 2024
1462398
CSS Chnages
NKOKKILIGADDA87 Aug 7, 2024
11bb1ba
CSS Changes
NKOKKILIGADDA87 Aug 7, 2024
6de0c90
CSS Changes
NKOKKILIGADDA87 Aug 7, 2024
044502b
CSS Changes
NKOKKILIGADDA87 Aug 7, 2024
f051391
Added README File for submodule common-ui
Aug 12, 2024
5ec42df
ng build CSS files syntex errors fix
NKOKKILIGADDA87 Aug 26, 2024
c6acea4
readme file changes
NKOKKILIGADDA87 Aug 29, 2024
c03dec3
registration page personal and location information submit button fix
NKOKKILIGADDA87 Sep 2, 2024
ea1cc22
registration page next button fix
NKOKKILIGADDA87 Sep 4, 2024
a4fd683
location and other and personal information emity colume fix
NKOKKILIGADDA87 Sep 5, 2024
cbb93d0
revert location and other and personal information emity colume fix c…
NKOKKILIGADDA87 Sep 6, 2024
5bed5b1
location and other and personal information emity colume fix changes
NKOKKILIGADDA87 Sep 9, 2024
113f377
revert location and other and personal information emity colume fix c…
NKOKKILIGADDA87 Sep 9, 2024
e1537b1
Corrected language related and minor demographic related changes in r…
devikasuresh20 Sep 11, 2024
a67b0d1
personal information DOB future date hide
Sep 12, 2024
41a065d
revert personal information DOB future date hide
NKOKKILIGADDA87 Sep 12, 2024
8ec5888
Changes related to valiation of mob no, age and css in registration s…
devikasuresh20 Sep 13, 2024
88f1dad
Resolved merge conflicts
devikasuresh20 Sep 13, 2024
5c751cd
Changes done for routing to search screen after registration
devikasuresh20 Sep 13, 2024
246dfa4
Resolved merge conflicts
devikasuresh20 Sep 13, 2024
c5c2b05
Added negative value validation for age
devikasuresh20 Sep 16, 2024
cddee9f
Minor change in personal information and abha information
devikasuresh20 Sep 16, 2024
4cc72ff
Changes done for editing location details
devikasuresh20 Oct 1, 2024
4d08ff5
Personal information changes - ageAtMarriage
devikasuresh20 Oct 11, 2024
1270884
Alphaneumeric fields validation changes
devikasuresh20 Oct 14, 2024
1fe275b
Add ESLint and NPM Audit workflow
gupta-soham Oct 25, 2024
c15097e
Merge pull request #3 from gupta-soham/feat/add-lint-audit-workflow
drtechie Oct 26, 2024
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
11 changes: 11 additions & 0 deletions .github/workflows/lint_audit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: ESLint and NPM Audit

on:
push:
branches: [main, master, develop]
pull_request:
branches: [main, master, develop]

jobs:
lint-and-audit:
uses: PSMRI/.github/.github/workflows/lint_audit.yml@main
23 changes: 22 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,22 @@
# Common-UI
# AMRIT - Common-UI

As registration is a common process across multiple AMRIT modules, registration page needs to be configurable based on the service line and project. Providing a framework that makes it easier to modify and set up fields on the user interface (UI) for data collecting on service lines for MMU, HWC, and telemedicine. The system has to possess the ability to change according to certain project specifications, facilitating the easy customization of data fields to fulfil the distinct requirements of every project within these service lines.

## Features

* **Registration Page**: This page allows the user to create new beneficiaries and edit the data of existing beneficiaries. User can collect and submit personal information, Location Information, Other Information of beneficiaries. User can generate/download ABHA card in registration page.


## Building From Source

This microservice is developed using Java and the Spring Boot framework, with MySQL as the database.

### Prerequisites

Ensure that the following prerequisites are met before building the MMU service:

* JDK 17
* Maven
* Nodejs v18.10.0
* MySQL

Binary file added src/assets/images/default-avatar.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.profileData tr td span {
font-weight: bold;
}

img {
border-radius: 50%;
width: 100px;
height: 100px;
}

.table>tbody>tr>td, .table>tbody>tr>th {
padding: 4px;
border-top: none;
vertical-align: middle;
color: #52575C !important;
}
202 changes: 202 additions & 0 deletions src/registrar/beneficiary-details/beneficiary-details.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
<div class="row">
<div class="col-xs-12" *ngIf="benFlowStatus">
<img
*ngIf="!beneficiary?.benImage"
src="assets/images/default-avatar.gif"
alt="Default Patient Image"
/>
<img
*ngIf="beneficiary?.benImage"
[src]="beneficiary?.benImage"
alt="Patient Image"
/>
<div class="horizontal-scroll-except-first-column">
<table class="table profileData" aria-describedby="benDetails">
<tr style="font-size: 14px; color: #000000">
<th id="beneficiaryName">
{{ current_language_set?.bendetails?.beneficiaryName }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>{{ beneficiary?.benName }}</td>
</tr>
<tr style="font-size: 14px; color: #000000">
<th id="gender">
{{ current_language_set?.bendetails?.gender }} /
{{ current_language_set?.bendetails?.age }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>
{{ beneficiary?.genderName }} / {{ beneficiary?.age }} &nbsp;{{
beneficiary?.ageUnit
}}
</td>
</tr>
<tr style="font-size: 14px; color: #000000">
<th id="beneficiaryID">
{{ current_language_set?.bendetails?.beneficiaryID }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>{{ beneficiary?.beneficiaryID }}</td>
</tr>
<tr
*ngIf="
healthIDValue !== undefined &&
healthIDValue !== null &&
healthIDValue !== '' &&
healthIDValue.length > 0
"
style="font-size: 14px; color: #000000"
>
<th id="healthId">{{ current_language_set?.aBHA }}:</th>
</tr>
<ng-container
*ngIf="
healthIDArray !== undefined &&
healthIDArray !== null &&
healthIDArray.length > 0
"
>
<tr
style="color: #595959; font-size: 14px"
*ngFor="let healthIDValue of healthIDArray"
>
<td>{{ healthIDValue }}</td>
</tr>
</ng-container>
<tr style="font-size: 14px; color: #000000">
<th id="registrationDate">
{{ current_language_set?.bendetails?.registrationDate }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>
{{ beneficiary?.registrationDate | date: "dd/MM/yyyy, h:mm a" }}
</td>
</tr>
<tr style="font-size: 14px; color: #000000">
<th id="visitDate">
{{ current_language_set?.bendetails?.visitDate }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>{{ today | date: "dd/MM/yyyy, h:mm a" }}</td>
</tr>
<tr style="font-size: 14px; color: #000000">
<th id="district">
{{ current_language_set?.bendetails?.district }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>
{{ beneficiary?.districtName }} / {{ beneficiary?.villageName }}
</td>
</tr>
</table>
</div>
</div>

<div class="col-xs-12" *ngIf="!benFlowStatus">
<img
*ngIf="!beneficiary?.benImage"
src="assets/images/default-avatar.gif"
alt="Default Patient Image"
/>
<img
*ngIf="beneficiary?.benImage"
[src]="beneficiary?.benImage"
alt="Patient Image"
/>
<div class="horizontal-scroll-except-first-column">
<table class="table profileData" aria-describedby="benDetails">
<tr style="font-size: 14px; color: #000000">
<th id="beneficiaryName">
{{ current_language_set?.bendetails?.beneficiaryName }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>{{ beneficiaryName | titlecase }}</td>
</tr>

<tr style="font-size: 14px; color: #000000">
<th id="beneficiaryName">{{ current_language_set?.familyId }}:</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>
{{
benFamilyId !== null && benFamilyId !== undefined
? benFamilyId
: "NA"
}}
</td>
</tr>
<tr style="font-size: 14px; color: #000000">
<th id="gender">
{{ current_language_set?.bendetails?.gender }} /
{{ current_language_set?.bendetails?.age }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>
{{ beneficiary?.m_gender?.genderName }} /
{{ beneficiary?.age }} &nbsp;{{ beneficiary?.ageUnit }}
</td>
</tr>
<tr style="font-size: 14px; color: #000000">
<th id="beneficiaryID">
{{ current_language_set?.bendetails?.beneficiaryID }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>{{ beneficiary?.beneficiaryID }}</td>
</tr>
<tr
*ngIf="
healthIDValue !== undefined &&
healthIDValue !== null &&
healthIDValue !== '' &&
healthIDValue.length > 0
"
style="font-size: 14px; color: #000000"
>
<th id="healthId">{{ current_language_set?.aBHA }}:</th>
</tr>
<ng-container
*ngIf="
healthIDArray !== undefined &&
healthIDArray !== null &&
healthIDArray.length > 0
"
>
<tr
style="color: #595959; font-size: 14px"
*ngFor="let healthIDValue of healthIDArray"
>
<td>{{ healthIDValue }}</td>
</tr>
</ng-container>
<tr style="font-size: 14px; color: #000000">
<th id="registrationDate">
{{ current_language_set?.bendetails?.registrationDate }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>{{ regDate }}</td>
</tr>
<tr style="font-size: 14px; color: #000000">
<th id="district">
{{ current_language_set?.bendetails?.district }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>
{{ beneficiary?.i_bendemographics?.m_district?.districtName }} /
{{ beneficiary?.i_bendemographics?.m_districtblock?.blockName }}
</td>
</tr>
</table>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* AMRIT – Accessible Medical Records via Integrated Technology
* Integrated EHR (Electronic Health Records) Solution
*
* Copyright (C) "Piramal Swasthya Management and Research Institute"
*
* This file is part of AMRIT.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see https://www.gnu.org/licenses/.
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { BeneficiaryDetailsComponent } from './beneficiary-details.component';

describe('BeneficiaryDetailsComponent', () => {
let component: BeneficiaryDetailsComponent;
let fixture: ComponentFixture<BeneficiaryDetailsComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [BeneficiaryDetailsComponent],
}).compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(BeneficiaryDetailsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
Comment on lines +42 to +44
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add more test cases.

The single test case is just checking if the component is created.

Consider adding more test cases to verify the behavior and rendering of the component.

Do you want me to generate additional test cases or open a GitHub issue to track this task?

});
Loading
Loading