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

TM-UI-NEXT from develop to master Code push regarding CI Build Configurations #7

Open
wants to merge 178 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
178 commits
Select commit Hold shift + click to select a range
6eeb6ce
registration login forget pass reset pass security service service po…
Mar 13, 2024
df065fb
github workflows
Mar 14, 2024
4c47cbc
json files added
Mar 14, 2024
4b830f0
lint issues resolved
Mar 14, 2024
ba67398
worklist changes
Mar 15, 2024
668823b
visit details, vitals, examination, anc, pnce, search and register ch…
Mar 20, 2024
ff6431d
history, idrs, ncd screening, quick consult changes
Mar 21, 2024
1d9627e
doctor screen changes
Mar 24, 2024
4c3290e
changes in core components and quick consult changes
Mar 25, 2024
752a152
Table width CSS chnages
Mar 25, 2024
cd32a5a
nurse and doctor changes
Mar 25, 2024
576158b
Merge branch 'develop' of https://github.com/PSMRI/TM-UI-NEXT into de…
Mar 25, 2024
9fc2739
doctor update changes
Mar 26, 2024
dbbfab0
minor changes in popup
Mar 27, 2024
f32f4cd
css changes in all screens
Apr 5, 2024
4dad219
pharmcist routing to inventory changes
Apr 8, 2024
18f395a
nurse doctor changes
Apr 10, 2024
a945338
enabling functionality for the complaint chief
Apr 10, 2024
fd2ca2a
Merge branch 'develop' of https://github.com/PSMRI/TM-UI-NEXT into de…
Apr 10, 2024
28e8dec
fixed issues
Apr 12, 2024
aaefa05
nurse save changes
Apr 13, 2024
2de679c
minor changes
Apr 15, 2024
1cc4e69
resolved the issues for the past-obsteric-history
Apr 15, 2024
e2016b9
nurse doctor changes
Apr 15, 2024
57426df
issue fixes
Apr 16, 2024
00a92be
minor changes n css
Apr 16, 2024
1bce097
CSS changes
Apr 17, 2024
91e9f47
ci build configurations changes
May 8, 2024
f02e042
ci build configurations changes
May 8, 2024
123bd0e
ci environmentfile changes
May 9, 2024
cbb10ac
Merge branch 'master' of https://github.com/PSMRI/TM-UI-NEXT into dev…
May 14, 2024
c304fb5
fixed PR comments
May 14, 2024
eaf5e6a
Merge branch 'develop' of https://github.com/PSMRI/TM-UI-NEXT into de…
May 22, 2024
c9ee7a8
prescription quantity change
May 27, 2024
f7ded57
Merge branch 'develop' of https://github.com/PSMRI/TM-UI-NEXT into de…
May 27, 2024
b0e4903
nurse-doctor changes
May 27, 2024
4d93297
Merge branch 'develop' of https://github.com/PSMRI/TM-UI-NEXT into de…
May 28, 2024
4f537e7
CSS changes
May 28, 2024
c89c1a7
history and abha changes
May 28, 2024
fdedbcc
Merge branch 'develop' of https://github.com/PSMRI/TM-UI-NEXT into de…
May 28, 2024
1c60f52
css and enabling and disabling changes
May 28, 2024
c1c6cd1
added fix for the on change of visit category refresh the history pages
bhpratibha May 29, 2024
95e926f
Merge branch 'develop' of https://github.com/PSMRI/TM-UI-NEXT into de…
May 31, 2024
eb5383f
customization changes
Jun 4, 2024
af07914
missed changes
Jun 5, 2024
e2122bd
service point extra details save for customization
Jun 6, 2024
421eb05
bug fixes
Jun 7, 2024
5cdafe8
minor change in workarea
Jun 10, 2024
3cb20a4
added .gitmodules folder
Jun 12, 2024
023c2fa
app header changes
Jun 12, 2024
57499e0
json changes and environment url change
Jun 13, 2024
9b380f4
CSS CHNAGES
NKOKKILIGADDA87 Jun 17, 2024
6e60a74
CSS CHNAGES
NKOKKILIGADDA87 Jun 18, 2024
5d5e170
CSS Changes
NKOKKILIGADDA87 Jun 18, 2024
21aca46
CSS Changes
NKOKKILIGADDA87 Jun 18, 2024
d3029d5
CSS Changes
NKOKKILIGADDA87 Jun 18, 2024
e0dcdfc
CSS changes
NKOKKILIGADDA87 Jun 19, 2024
d823ef2
CSS changes
NKOKKILIGADDA87 Jun 20, 2024
b92bff8
CSS changes
NKOKKILIGADDA87 Jun 21, 2024
16f1f9a
CSS changes
NKOKKILIGADDA87 Jun 25, 2024
33ef508
CSS changes
NKOKKILIGADDA87 Jun 25, 2024
a7dd384
CSS changes
NKOKKILIGADDA87 Jun 25, 2024
4ae2584
Changes for patching height on patient revisit
devikasuresh20 Jun 27, 2024
4200af4
Merge pull request #15 from devikasuresh20/develop
ravishanigarapu Jun 27, 2024
de15215
CSS changes
NKOKKILIGADDA87 Jun 27, 2024
f7955b1
CSS Changes
NKOKKILIGADDA87 Jun 28, 2024
f6c5273
CSS Changes
NKOKKILIGADDA87 Jun 28, 2024
4adc157
CSS Changes
NKOKKILIGADDA87 Jun 28, 2024
d272738
Changes done for Revisit filteration issue
devikasuresh20 Jul 1, 2024
3684b85
Resolved conflicts
devikasuresh20 Jul 1, 2024
4be6bbd
Merge pull request #16 from devikasuresh20/develop
ravishanigarapu Jul 1, 2024
95f25de
Update environment.ci.ts.template
pavangsk Jul 1, 2024
3259302
CSS Changes
NKOKKILIGADDA87 Jul 2, 2024
20fc569
Changes for adding Revisit & Refer section for Gen OPD QC
devikasuresh20 Jul 4, 2024
ae59b66
Resolved merge conlflicts
devikasuresh20 Jul 4, 2024
8d475f1
CSS chnages
NKOKKILIGADDA87 Jul 4, 2024
f648cab
Added code improvements according to JS and also resolved prettier es…
devikasuresh20 Jul 4, 2024
32035ca
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Jul 4, 2024
0b68a48
Resolved merge conflicts
devikasuresh20 Jul 4, 2024
ab77fc5
Minor change in workarea
devikasuresh20 Jul 5, 2024
a7fa360
date format issue fixed
Jul 9, 2024
f950d48
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Jul 9, 2024
d6e33c7
Changes done for removing covid vaccination status
devikasuresh20 Jul 10, 2024
52c76af
Resolved merge conflicts
devikasuresh20 Jul 10, 2024
38ee30c
Merge pull request #18 from devikasuresh20/develop
ravishanigarapu Jul 10, 2024
82d89ab
Resolved Merged conflicts and merged customization to develop
Jul 10, 2024
1ac7679
Merge branch 'develop' of https://github.com/PSMRI/TM-UI into develop
Jul 10, 2024
3b43b8c
added refer date issue resolved
Jul 10, 2024
cd062d8
CSS chnages
NKOKKILIGADDA87 Jul 12, 2024
cf57f43
Merge branch 'develop' of https://github.com/PSMRI/TM-UI into develop
NKOKKILIGADDA87 Jul 12, 2024
790f2b7
CSS chnages
NKOKKILIGADDA87 Jul 12, 2024
4a6f584
Merge branch 'develop' of https://github.com/PSMRI/TM-UI into develop
NKOKKILIGADDA87 Jul 12, 2024
fd8142b
CSS chnages
NKOKKILIGADDA87 Jul 14, 2024
eb71520
CSS chnages
NKOKKILIGADDA87 Jul 14, 2024
4fd461f
change in css for radio button for tablet view
Jul 16, 2024
32cec5a
CSS responsive changes
Jul 23, 2024
68d3de5
CSS responsive changes
pavangsk Jul 24, 2024
1db2196
CSS responsive Chnages
raj9885 Jul 24, 2024
a5817ce
CSS responsive Chnages
raj9885 Jul 24, 2024
1248014
CSS Changes
NKOKKILIGADDA87 Jul 25, 2024
3dd745f
bio changes
Jul 26, 2024
599b45f
merge conflicts resolved
Jul 26, 2024
21a39ea
changes in health-id-display-modal for tm
Jul 29, 2024
048180b
Change in code for visitCode for local storage
Jul 30, 2024
ccacdcb
CSS changes
NKOKKILIGADDA87 Jul 31, 2024
759271e
CSS changes
NKOKKILIGADDA87 Jul 31, 2024
449c989
CSS changes
NKOKKILIGADDA87 Jul 31, 2024
c9cf82a
CSS changes
NKOKKILIGADDA87 Aug 2, 2024
76c7b57
CSS changes
NKOKKILIGADDA87 Aug 2, 2024
bba4f14
CSS changes
NKOKKILIGADDA87 Aug 2, 2024
1a05b59
Changes for history Past Obstetric History in PNC visit category for tm
Aug 6, 2024
e3b74bb
Added common-ui configuration in git hub workflows
Aug 7, 2024
22090ae
CSS Changes
NKOKKILIGADDA87 Aug 7, 2024
0e58c04
Merge branch 'develop' of https://github.com/PSMRI/TM-UI into develop
NKOKKILIGADDA87 Aug 7, 2024
203e378
CSS Changes
NKOKKILIGADDA87 Aug 7, 2024
5c0d481
Modified README file for submodule common-ui
Aug 12, 2024
f18d9c3
[33] - Updated outputPath in angular.json
anandamideShakyan Aug 16, 2024
862dd72
Merge pull request #24 from anandamideShakyan/develop
drtechie Aug 20, 2024
4fc9a8e
es lint errors fix
NKOKKILIGADDA87 Aug 21, 2024
ccfbf45
upload file cancel button fix
NKOKKILIGADDA87 Aug 26, 2024
c3211ff
ng build CSS files syntex errors fix
NKOKKILIGADDA87 Aug 26, 2024
05b2c01
common_UI deployement
NKOKKILIGADDA87 Aug 26, 2024
514cd65
readme file changes and add nvmrc file
NKOKKILIGADDA87 Aug 29, 2024
1164ded
swaasa issue
NKOKKILIGADDA87 Aug 30, 2024
171b461
comman UI wardeployement
NKOKKILIGADDA87 Sep 2, 2024
c1123c6
Change in interceptor service for Swasaa
Sep 2, 2024
ea9fa10
Merge branch 'develop' of https://github.com/PSMRI/TM-UI into develop
Sep 2, 2024
16fda7e
Change in interceptor service for Swasaa
NKOKKILIGADDA87 Sep 3, 2024
9b7da60
comman UI wardeployement
NKOKKILIGADDA87 Sep 5, 2024
c1a0f46
[33] - Update environment.ci.ts.template
anandamideShakyan Sep 5, 2024
97ada85
[33] - Update environment.ci.ts.template
anandamideShakyan Sep 5, 2024
19e56c6
Update environment.ci.ts.template
anandamideShakyan Sep 5, 2024
bc9e005
Update environment.ci.ts.template
anandamideShakyan Sep 5, 2024
b2c2839
comman UI wardeployement
NKOKKILIGADDA87 Sep 6, 2024
df12e46
Merge pull request #28 from anandamideShakyan/develop
drtechie Sep 6, 2024
e7388e2
Merge branch 'develop' of https://github.com/PSMRI/TM-UI into develop
NKOKKILIGADDA87 Sep 6, 2024
0c60732
warfile deployement
NKOKKILIGADDA87 Sep 12, 2024
f87039d
Added mandatory condition for Travel History section
devikasuresh20 Sep 16, 2024
3278c5a
Added mandatory condition for Travel History section (#30)
devikasuresh20 Sep 18, 2024
0079423
URL changes using jboss context-root
devikasuresh20 Sep 18, 2024
aaf8f8c
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Sep 18, 2024
cea5d1f
Minor change in angular.json
devikasuresh20 Sep 19, 2024
a00c4b4
Minor change
devikasuresh20 Sep 19, 2024
3603cc5
Merge pull request #31 from devikasuresh20/develop
devikasuresh20 Sep 19, 2024
0011d46
Workarea related change in nurse module
devikasuresh20 Oct 7, 2024
d041fff
Workarea related change in nurse module (#35)
devikasuresh20 Oct 7, 2024
0cc9fdd
ANC menstrual history changes
devikasuresh20 Oct 10, 2024
495d74e
AMM-1013 ANC menstrual history changes (#36)
devikasuresh20 Oct 10, 2024
7384ec6
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Oct 14, 2024
01392d7
File upload changes
devikasuresh20 Oct 24, 2024
e8339b2
Minor changes in file upload
devikasuresh20 Oct 24, 2024
0177116
AMM-941 & AMM-964 File upload changes (#37)
devikasuresh20 Oct 25, 2024
dbffe58
Add ESLint and NPM Audit workflow
gupta-soham Oct 25, 2024
04c06a8
Merge pull request #38 from gupta-soham/feat/add-lint-audit-workflow
drtechie Oct 26, 2024
3b9f338
Diagnosis changes
devikasuresh20 Oct 28, 2024
d8ed76c
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Oct 28, 2024
80ea71c
AMM-1009 Diagnosis changes (#39)
devikasuresh20 Oct 29, 2024
4cdc1a3
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Nov 11, 2024
fe9335c
CSS changes for Schedule for TM Screen
devikasuresh20 Nov 13, 2024
ca0dc0a
Minor changes
devikasuresh20 Nov 13, 2024
4e577c0
Minor changes
devikasuresh20 Nov 13, 2024
014b4ea
Merge pull request #42 from devikasuresh20/develop
devikasuresh20 Nov 13, 2024
ea6cca7
Added scroll bar for Schedule TM pop up (#43)
devikasuresh20 Nov 13, 2024
7a08ef5
AMM-1055 Family History Diabetes Mellitus info message changes (#44)
devikasuresh20 Nov 14, 2024
713a112
AMM-1063 File upload changes (#45)
devikasuresh20 Nov 15, 2024
79a53da
AMM-1008 Previous ben visit details changes (#46)
devikasuresh20 Nov 18, 2024
7d18147
AMM-1106 Systolic and Diastolic mandatory changes for NCD screening a…
devikasuresh20 Dec 4, 2024
3bb0c13
added Urls for common ui
Dec 11, 2024
027fefd
Merge branch 'develop' of https://github.com/PSMRI/TM-UI into develop
Dec 11, 2024
21f28b5
Abdm facility and version 3 changes
Dec 16, 2024
86bd579
Update minor change in workarea.component.ts
helenKaryamsetty Dec 16, 2024
35863b2
Merge pull request #52 from helenKaryamsetty/develop
devikasuresh20 Dec 16, 2024
7c591aa
facility changes
Dec 17, 2024
53de49c
Merge branch 'develop' of https://github.com/helenKaryamsetty/TM-UI-N…
Dec 17, 2024
a907a26
Merge branch 'PSMRI:develop' into develop
helenKaryamsetty Dec 17, 2024
b2e3ca0
facility logic correction
Dec 18, 2024
131bc7e
Merge branch 'develop' of https://github.com/helenKaryamsetty/TM-UI-N…
Dec 18, 2024
0b2d043
Merge pull request #53 from helenKaryamsetty/develop
devikasuresh20 Dec 18, 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
5 changes: 5 additions & 0 deletions .github/workflows/build-on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
submodules: true
fetch-depth: 0

- name: Update submodules
run: git submodule update --init --recursive

- name: Setup JDK 17
uses: actions/setup-java@v2
Expand Down
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
2 changes: 1 addition & 1 deletion .github/workflows/package-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: TM-UI
path: dist/tm-ui-next/tm-ui-next.war
path: dist/tm-ui/tm-ui.war
10 changes: 8 additions & 2 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ jobs:

- name: Checkout code
uses: actions/checkout@v3
with:
submodules: true # Include submodules
fetch-depth: 0 # Ensure the full history is fetched

- name: Update submodules
run: git submodule update --init --recursive

- name: Set up Java
uses: actions/setup-java@v3
Expand All @@ -40,10 +46,10 @@ jobs:
npm run build

- name: Create WAR file
run: jar -cvf tm-ui-next.war -C dist .
run: jar -cvf tm-ui.war -C dist .

- name: Upload WAR file as artifact
uses: actions/upload-artifact@v2
with:
name: TM-UI
path: tm-ui-next.war
path: tm-ui.war
47 changes: 0 additions & 47 deletions .github/workflows/sast.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "Common-UI"]
path = Common-UI
url = https://github.com/PSMRI/Common-UI
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v18
1 change: 1 addition & 0 deletions Common-UI
Submodule Common-UI added at d0d8d3
35 changes: 30 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ Telemedicine plays a crucial role in the services provided by Health and Wellnes

This microservice is built using Java and the Spring Boot framework, with MySQL as the underlying database. Before building the TM module, ensure you have the following prerequisites:

- JDK 17
- Maven
- NPM/YARN
- Spring Boot V2
- MySQL
* JDK 17
* Maven
* Nodejs v18.10.0
* MySQL

To build the TM module from source, follow these steps:

Expand Down Expand Up @@ -59,3 +58,29 @@ Refer to `src/environments/environment.ci.template` file and ensure that the rig

Packing with `ci` profile calls `build-ci` script in `package.json`.
It creates a `environment.ci.ts` file with all environment variables used in the generated build.

### Initializing Submodule `Common-UI`

To initialize the `Common-UI` submodule, follow these steps:

1. Clone the `tm-ui` project:

git clone https://github.com/PSMRI/TM-UI

2. Navigate to the project directory and pull the latest changes from the develop branch
cd tm-ui
git checkout develop
git pull origin develop

3. Open the integrated terminal for the common-ui submodule and initialize it

cd Common-UI
git init
git remote add origin https://github.com/PSMRI/Common-UI
git submodule update --init --recursive

4. Check the available branches and switch to the develop branch

git branch
git checkout develop
git pull origin develop
3 changes: 3 additions & 0 deletions WEB-INF/jboss-web.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<jboss-web>
<context-root>/tm</context-root>
</jboss-web>
47 changes: 41 additions & 6 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": 1,
"newProjectRoot": "projects",
"projects": {
"TM-UI-NEXT": {
"TM-UI": {
"projectType": "application",
"schematics": {},
"root": "",
Expand All @@ -13,7 +13,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/tm-ui-next",
"outputPath": "dist/",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": [
Expand All @@ -22,7 +22,12 @@
"tsConfig": "tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
"src/assets",
{
"glob": "**/*",
"input": "WEB-INF",
"output": "WEB-INF"
}
],
"styles": [
"@angular/material/prebuilt-themes/indigo-pink.css",
Expand Down Expand Up @@ -54,6 +59,36 @@
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
},
"ci": {
"budgets": [
{
"type": "initial",
"maximumWarning": "5mb",
"maximumError": "6mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "1mb",
"maximumError": "2mb"
}
],
"outputHashing": "all",
"optimization": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.ci.ts"
}
]
},
"test":{
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.test.ts"
}
]
}
},
"defaultConfiguration": "production"
Expand All @@ -62,18 +97,18 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "TM-UI-NEXT:build:production"
"browserTarget": "TM-UI:build:production"
},
"development": {
"browserTarget": "TM-UI-NEXT:build:development"
"browserTarget": "TM-UI:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "TM-UI-NEXT:build"
"browserTarget": "TM-UI:build"
}
},
"test": {
Expand Down
57 changes: 55 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading