Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
177 commits
Select commit Hold shift + click to select a range
15ed20f
Intial commit for develop for testing
Feb 5, 2024
59fc2ba
Inventory Changes
Feb 27, 2024
2bc5f71
Few Minor Changes in Inventory-UI-Next
Mar 1, 2024
427b2a1
Small changes in css for redirection from mmu
Mar 5, 2024
fdecd5f
Change in indent
Mar 7, 2024
c21c479
Fix in routing from mmu to Inventory
Mar 12, 2024
41068ae
added latest report changes and indent changes
Mar 12, 2024
06433c2
changes with ns lint
Mar 12, 2024
5a8a7bf
Bug fix for functionality v-1.0
Mar 13, 2024
b1b3449
CSS and functionality bug fix
Mar 13, 2024
131c409
ES Lint and Git Hub workflow changes
Mar 13, 2024
fd05815
Reverted the change for login
Mar 13, 2024
a94910b
Git Hub Work Flow Test
Mar 14, 2024
ce37ef3
fixed report downloading issue and future date disable
Mar 14, 2024
fe499fe
modified angular.json optimization
Mar 14, 2024
764719d
change in login for eqeqeq
Mar 14, 2024
b87256f
inventory CSS changes
Mar 15, 2024
00eb6b3
mereg conflex resolve
Mar 15, 2024
6d63dad
forgot password CSS changes
Mar 15, 2024
450578c
common-dialog CSS changes
Mar 15, 2024
be2d63b
Hotspot fix for Inventory
Mar 15, 2024
3164b08
Merge conflicts resolve
Mar 15, 2024
cbcc0f5
ng lint error fix
Mar 15, 2024
0594c34
removed commented code with header fix
Mar 15, 2024
3b1f7f8
Merge conflicts fixed with header css
Mar 15, 2024
68618b2
fixed routing issue
Mar 18, 2024
eaffe69
Fix done for login and facility
Mar 20, 2024
ffa9e91
redirect Screen CSS changes
Mar 20, 2024
2edf8a0
redirect Screen css Changes
Mar 20, 2024
2473fd2
redirect CSS Changes
Mar 20, 2024
9a0e032
admin CSS Changes
Mar 20, 2024
7e8b488
Header CSS Changes
Mar 20, 2024
8a1a747
minor css fix for rx-dashboard
Mar 21, 2024
ea5360a
bugg Fix CSS changes
Mar 21, 2024
375120f
fixed lint issue
Mar 21, 2024
f1aa067
Bug fixes for Inventory indent and css and some functionality related
Mar 21, 2024
2803af3
Merge branch 'develop' of https://github.com/PSMRI/Inventory-UI-NEXT …
Mar 21, 2024
0516d1f
Bug fix for patient returns
Mar 21, 2024
e6de349
Changes in table structure for patient returns
Mar 22, 2024
451fc47
fixed issue for radio button
Mar 22, 2024
f190b8d
Bug Fix Changes
Mar 22, 2024
f46d2ab
Merge branch 'develop' of https://github.com/PSMRI/Inventory-UI-NEXT …
Mar 22, 2024
5f65280
removed // for report downloading
Mar 22, 2024
9780df9
Functionality Bug fix for inventory-ui-next
Mar 24, 2024
7925163
Merge branch 'develop' of https://github.com/PSMRI/Inventory-UI-NEXT …
Mar 24, 2024
9174795
fix for nested tables in inventory-ui-next
Mar 26, 2024
41db600
Updated package.lock.json for inventory
Mar 26, 2024
81a5bd1
Table search fix for view-medicine component
Mar 27, 2024
5a81c12
Fixed the reset password screen for inventory-ui-next
Mar 27, 2024
2da2e3e
Fix for placeholder and expiry date in manual dispense
Mar 27, 2024
256dce4
Bug fix for functionality including print
Mar 27, 2024
0f4604a
Bug Fix CSS changes
Mar 27, 2024
17937b9
Merge branch 'develop' of https://github.com/PSMRI/Inventory-UI-NEXT …
Mar 27, 2024
1374ae3
Merge branch 'develop' of https://github.com/PSMRI/Inventory-UI-NEXT …
Mar 28, 2024
b79aead
Remove placeholder chnages
Mar 28, 2024
ddc0593
removed / from fhir api
Mar 28, 2024
943c802
modal popup CSS chnages
Mar 28, 2024
f3ea842
Merge branch 'develop' of https://github.com/PSMRI/Inventory-UI-NEXT …
Mar 29, 2024
8a1216a
select indent issue fixed
Mar 29, 2024
89a9a5b
Fix bugs for expiry date and search component
Mar 29, 2024
cd6381d
Merge branch 'develop' of https://github.com/PSMRI/Inventory-UI-NEXT …
Mar 29, 2024
c8ba376
bugg fix CSS changes
Mar 29, 2024
818a988
Bug fix for Pagination for inventory
Mar 29, 2024
1409375
Merge branch 'develop' of https://github.com/PSMRI/Inventory-UI-NEXT …
Mar 29, 2024
ea09e6e
Updated Environment.ts file
Mar 29, 2024
ac0bf5f
Changes in url in environment.ts in inventory
Mar 30, 2024
a215d11
resolved view error
Apr 1, 2024
6ead78d
Bug fix for paginator in some places
Apr 1, 2024
c466f81
Merge branch 'develop' of https://github.com/PSMRI/Inventory-UI-NEXT …
Apr 1, 2024
e1546fb
some CSS changes
Apr 2, 2024
61a3b01
bugs resolved
Apr 2, 2024
ae767be
removed / from environment file
Apr 2, 2024
7a2602a
Request object fix
Apr 2, 2024
07a705f
delete and other bugs resolved
Apr 3, 2024
1275adf
update issue fixed
Apr 3, 2024
2d30ef1
Bugg defect CSS changes
Apr 3, 2024
3b190b7
merge conflex resolve
Apr 3, 2024
64c36ad
environment file change
Apr 3, 2024
c3eda82
Changes for stockAdjustmentDraft
Apr 4, 2024
e5734f9
environment file change
Apr 4, 2024
4148f6f
Environment.ts updated
Apr 4, 2024
f5111c5
CSS changes
Apr 4, 2024
0c4937d
Bug fix for mmu to inv routing screen
Apr 4, 2024
2356fa7
Issue resolved for mmu to inv screen
Apr 4, 2024
36b51c7
Merge conflicts resolved for inv
Apr 16, 2024
476c39c
change in edl condition
Apr 16, 2024
8eb9a17
added devkit dependency
Apr 24, 2024
027e468
removed vun from inv latest
Apr 24, 2024
5d9e43d
change in pck.lock.json for webpack
Apr 25, 2024
014c50e
removed some commented code and fix eqeqeq
Apr 25, 2024
6f3eaa8
ci build configurations changes
May 9, 2024
4c44d37
ci environmentfile changes
May 9, 2024
e607651
Merge branch 'master' of https://github.com/PSMRI/Inventory-UI-NEXT i…
May 14, 2024
a97dab2
bug fix for upgrad Inv--url's
May 14, 2024
424e218
Merge branch 'develop' of https://github.com/PSMRI/Inventory-UI-NEXT …
May 14, 2024
fe9f973
css fix in patient return screen for buttons
May 16, 2024
70694bd
Added correct request object for reports/shot-expiry
Jun 12, 2024
05fceda
Merge branch 'develop' of https://github.com/PSMRI/Inventory-UI
Jul 3, 2024
e9e57b8
change in table column name in itm-dispense
Jul 3, 2024
edb4b61
CSS changes
NKOKKILIGADDA87 Aug 2, 2024
a56f094
[33] - Updated outputPath in angular.json
anandamideShakyan Aug 16, 2024
fdf3e97
Merge pull request #31 from anandamideShakyan/develop
drtechie Aug 20, 2024
a5bedad
Resolved es lint issues with eqeqeq in inv
Aug 22, 2024
3978479
readme file changes and add nvmrc file
NKOKKILIGADDA87 Aug 29, 2024
18fc282
URL changes using jboss context-root
devikasuresh20 Sep 18, 2024
33b7624
Minor changes in jboss-web.xml and angular.json
devikasuresh20 Sep 19, 2024
a64a0aa
Merge pull request #33 from devikasuresh20/develop
devikasuresh20 Sep 19, 2024
3683c62
Added medicine batches empty condition for indent and also corrected …
devikasuresh20 Sep 27, 2024
ebf6e90
Added medicine batches empty condition for indent and also corrected …
devikasuresh20 Sep 27, 2024
e05dccc
Removed extra slash from allocateStockFromItemID API URL
devikasuresh20 Oct 1, 2024
dee9682
AMM-1000 Dispense Quantity is not patching in medicine dispense scree…
devikasuresh20 Oct 3, 2024
ba8c375
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Oct 9, 2024
cf09c4e
Set security question changes
devikasuresh20 Oct 9, 2024
d18e10c
Manual dispense related changes
devikasuresh20 Oct 10, 2024
8e5df47
Merge pull request #36 from devikasuresh20/develop
ravishanigarapu Oct 10, 2024
288cde8
Added serviceProviderId in local storage
devikasuresh20 Nov 21, 2024
f7b9e3c
Added serviceProviderId in local storage (#41)
devikasuresh20 Nov 21, 2024
7457e3f
inventory wasa first commit
NKOKKILIGADDA87 Nov 29, 2024
f69d74a
inventory wasa second commit
NKOKKILIGADDA87 Nov 29, 2024
08f8ea6
inventory wasa third commit
NKOKKILIGADDA87 Nov 29, 2024
d685861
inventory wasa forth commit
NKOKKILIGADDA87 Nov 29, 2024
e32900f
inventory wasa fifth commit
NKOKKILIGADDA87 Nov 30, 2024
fbca2f4
ngx cookie service version change
NKOKKILIGADDA87 Dec 2, 2024
1d36fe1
sonar issue fix
sandipkarmakar3 Dec 9, 2024
e136ea2
sonar issue fix
sandipkarmakar3 Dec 9, 2024
2c00ed6
sonar issue fix & session service path change
sandipkarmakar3 Dec 9, 2024
f3ddfd8
minor fix
sandipkarmakar3 Dec 10, 2024
12cb71f
userID and UserName convert to sessionstorage
NKOKKILIGADDA87 Dec 14, 2024
d6fe090
remove JWT tokken setItem
NKOKKILIGADDA87 Dec 18, 2024
45e7bf0
remove EncKey
NKOKKILIGADDA87 Dec 18, 2024
1b160ee
sessionStorageEncKey value emity
NKOKKILIGADDA87 Dec 21, 2024
91daa8d
Merge branch 'PSMRI:develop' into develop
devikasuresh20 Dec 23, 2024
013b790
Added CSS files for offline inventory
devikasuresh20 Dec 23, 2024
2a17b5b
Merge pull request #52 from devikasuresh20/develop
ravishanigarapu Dec 23, 2024
713a1f2
Update README.md
Sneha6003 Jan 20, 2025
761eda7
Merge branch 'develop' of https://github.com/PSMRI/Inventory-UI into …
sandipkarmakar3 Jan 23, 2025
1f34565
ready to merge with Develop
sandipkarmakar3 Jan 23, 2025
73f44e8
docs: update README.md [skip ci]
allcontributors[bot] Jan 27, 2025
24c39c5
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] Jan 27, 2025
3f97564
Merge pull request #59 from PSMRI/all-contributors/add-devikasuresh20
Sneha6003 Jan 27, 2025
735cf6a
assigned port 4201 and updated the env for local development
Asp-irin Jan 29, 2025
c255867
-wasa removed
sandipkarmakar3 Jan 30, 2025
43561d8
Merge pull request #60 from Asp-irin/develop
drtechie Jan 30, 2025
342011c
Devika coments resolved
sandipkarmakar3 Jan 31, 2025
ddb4bca
Merge pull request #42 from PSMRI/inventory-wasa
devikasuresh20 Jan 31, 2025
19d5ced
updated readme for uniformity and simplicity.
techy4shri Feb 5, 2025
b396b9f
Add LICENSE and CODE_OF_CONDUCT
drtechie Feb 13, 2025
7e442ed
Update README.md
drtechie Feb 13, 2025
04e2194
Merge pull request #64 from techy4shri/readme
drtechie Feb 14, 2025
20ea846
fix: make GitHub Actions pass with correct Node version, submodules, …
abhijeetw035 Apr 9, 2025
7ba6c14
Merge pull request #75 from abhijeetw035/bugfix/issue-53
drtechie Apr 9, 2025
2277002
(fix): deleted unnecessary package-prod.yml
abhijeetw035 Apr 9, 2025
8eee0ec
(fix) : Added yml extension to build on PR
abhijeetw035 Apr 9, 2025
94284be
Merge pull request #76 from abhijeetw035/bugfix/issue-53
drtechie Apr 9, 2025
c69e666
feat(commitlint.config.js, package.json,package-lock.json commit-msg)…
techy4shri Apr 16, 2025
7c902d6
feat(commitlint.config.js commit-msg): fixed commitlint working
techy4shri Apr 16, 2025
2c76868
fix(pre-commit commitlint.config.js): version error resolution
techy4shri Apr 16, 2025
6f24336
feat(commit-lint.yaml): added commit-lint workflow
techy4shri Apr 16, 2025
2cc62cd
perf(commitlint.config.js): improved commitlint
techy4shri Apr 16, 2025
58042b7
style(commit-lint.yaml): newline addition
techy4shri Apr 16, 2025
b2319ae
Merge pull request #77 from techy4shri/lint-setup
drtechie Apr 16, 2025
9f6e1c6
fix(build-on-pull-request.yml): name and indentation correction in gi…
techy4shri Apr 16, 2025
34ab4ef
Merge branch 'PSMRI:develop' into workflow
techy4shri Apr 16, 2025
c95b136
Merge pull request #78 from techy4shri/workflow
drtechie Apr 17, 2025
cdff5d9
feat: ensure url doesn't have version. upgrade version
drtechie May 15, 2025
acd17cb
fix: war file artifact names
drtechie May 16, 2025
c574901
fix: update names of the services in pom.xml files
drtechie May 19, 2025
bf9fb20
Merge pull request #80 from PSMRI/build-update
drtechie May 19, 2025
acb2291
feat: captcha security addition
5Amogh May 30, 2025
74f6835
feat: captcha reset handling,env injection removed es lint for html,css
5Amogh Jun 4, 2025
11d0c21
feat: enabling captcha via env and es-lint check for htm,css removed
5Amogh Jun 5, 2025
75e87c8
Merge pull request #81 from PSMRI/develop-amogh
5Amogh Jun 11, 2025
fbf4fee
fix: type fix for the enable captcha variable (#82)
5Amogh Jun 17, 2025
fb9b09e
fix(rx): call allocate() to display the quantity dispensed in manual …
vanitha1822 Jun 23, 2025
633090f
Merge pull request #83 from PSMRI/nd-vs/AMM-1639
vanitha1822 Jun 24, 2025
de6eada
Update the URL (#84)
vanitha1822 Jun 27, 2025
61fb2cf
fix: response error for login (#85)
vishwab1 Jul 2, 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
26 changes: 26 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"files": [
"README.md"
],
"imageSize": 100,
"commit": false,
"commitType": "docs",
"commitConvention": "angular",
"contributors": [
{
"login": "devikasuresh20",
"name": "Devika S",
"avatar_url": "https://avatars.githubusercontent.com/u/57424483?v=4",
"profile": "https://github.com/devikasuresh20",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
"skipCi": true,
"repoType": "github",
"repoHost": "https://github.com",
"projectName": "Inventory-UI",
"projectOwner": "PSMRI"
}
43 changes: 0 additions & 43 deletions .github/workflows/build-on-pull-request

This file was deleted.

42 changes: 42 additions & 0 deletions .github/workflows/build-on-pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Build On Pull Request

on:
pull_request:
branches: [ "master", "develop" ]

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout code with submodules
uses: actions/checkout@v4
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 init
git submodule update --recursive

- name: Setup JDK 17
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'adopt'

- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 18

- name: Build with NPM and Maven
run: |
npm config set legacy-peer-deps true
npm install -g @angular/cli
npm install typescript@5.1.3 --save-dev
npm install --force
npm run build-ci
30 changes: 30 additions & 0 deletions .github/workflows/commit-lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Commit Compliance

on:
pull_request:
types: [opened, synchronize, reopened]

jobs:
commitlint:
runs-on: ubuntu-latest

steps:
- name: Checkout code with submodule
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
submodules: true
fetch-depth: 0

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 18

- name: Install dependencies
run: npm ci --legacy-peer-deps

- name: Run commitlint on PR
run: |
npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} --verbose
51 changes: 0 additions & 51 deletions .github/workflows/package-prod.yml

This file was deleted.

14 changes: 6 additions & 8 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ jobs:
steps:

- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4


- name: Set up Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'

- name: Set up Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18

Expand All @@ -35,16 +35,14 @@ jobs:
npm config set legacy-peer-deps true
npm install -g @angular/cli
npm install typescript@5.1.3 --save-dev
npm install ng2-smart-table@1.2.1
npm install node-sass
npm install --force
npm run build

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

- name: Upload WAR file as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Inventory-UI
path: inventory-ui-next.war
path: inventory-ui.war
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/tmp
/out-tsc
/bazel-out
/environments/enckey.ts

# Node
/node_modules
Expand Down Expand Up @@ -40,3 +41,6 @@ testem.log
# System files
.DS_Store
Thumbs.db

src/environments/environment.ts
src/environments/environment.ci.ts
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.git
1 change: 1 addition & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
commitlint --edit ./.git/COMMIT_EDITMSG
5 changes: 1 addition & 4 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx lint-staged
# This file is managed by Husky. Do not edit this file directly.
npx lint-staged
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v18
128 changes: 128 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
amrit@piramalswasthya.org.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
Loading
Loading