Merged conflicts resolved for admin develop branch #22
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… customization
…into customization
…into customization
…into customization
[33] - Update environment.ci.ts.template
helenKaryamsetty
requested changes
Aug 12, 2024
helenKaryamsetty
added a commit
that referenced
this pull request
Sep 11, 2024
* Merged conflicts resolved for admin develop branch (#22) * customization changes * modified change * CSS changes * some modified changes * CSS changes * custom changes * validations for project msaster name and field title addition * small change * resolved the bug fixes for customization admin * logic implementation on project-serviceline-mapping * change in logic for datasource for project-serviceline-mapping * added validation for fieldName * Bug fixes for admin customization * Small change in project serviceline * Change in update request object * CSS CHNAGES * project serviceline mapping changes * Error issue * Error issue * CSS Changes * css changes * CSS chnages * CSS chnages * CSS chnages * CSS chnages * CSS chnages * Update environment.ci.ts.template * CSS chnages * CSS changes * CSS changes * Bug fix for update in emplopyee master * change in index file for console.warn --------- Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> * ANM- 942: Location serviceline userid passing incorrect --------- Co-authored-by: Parth Kothari <109517053+KpParth@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com>
helenKaryamsetty
added a commit
to helenKaryamsetty/ADMIN-UI-New
that referenced
this pull request
Jan 9, 2025
* ANM - 942 userId passing wrong (PSMRI#26) * Merged conflicts resolved for admin develop branch (PSMRI#22) * customization changes * modified change * CSS changes * some modified changes * CSS changes * custom changes * validations for project msaster name and field title addition * small change * resolved the bug fixes for customization admin * logic implementation on project-serviceline-mapping * change in logic for datasource for project-serviceline-mapping * added validation for fieldName * Bug fixes for admin customization * Small change in project serviceline * Change in update request object * CSS CHNAGES * project serviceline mapping changes * Error issue * Error issue * CSS Changes * css changes * CSS chnages * CSS chnages * CSS chnages * CSS chnages * CSS chnages * Update environment.ci.ts.template * CSS chnages * CSS changes * CSS changes * Bug fix for update in emplopyee master * change in index file for console.warn --------- Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> * ANM- 942: Location serviceline userid passing incorrect --------- Co-authored-by: Parth Kothari <109517053+KpParth@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> * URL changes using jboss context-root * Minor change in angular.json * Minor changes * abdm facility addition changes in job location mapping * Service line filteration changes in institution screens * Service line filteration changes in institution screens (PSMRI#31) * Changes in Item Master screen * AMM-1001 Item Master Screen Changes (PSMRI#35) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * AMM-1020 & AMM-1025 (PSMRI#37) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * AMM-1022 procedure component mapping changes (PSMRI#38) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * Project configuration changes * AMM-1036 Project configuration changes (PSMRI#39) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * Project configuration changes * Add ESLint and NPM Audit workflow * User role agent Id mapping changes * Minor changes * AMM-993 User role agent Id mapping changes (PSMRI#42) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * Project configuration changes * User role agent Id mapping changes * Minor changes * Update environment.ci.ts.template * Update environment.ci.ts.template * modified environment.ci.ts.template * In Table search changes * Minor changes * Remove extra / from ci environment --------- Co-authored-by: Parth Kothari <109517053+KpParth@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> Co-authored-by: devikasuresh20 <devika.s36@wipro.com> Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com> Co-authored-by: Soham Gupta <soham.gupta003@gmail.com> Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>
helenKaryamsetty
added a commit
to helenKaryamsetty/ADMIN-UI-New
that referenced
this pull request
Jan 9, 2025
* ANM - 942 userId passing wrong (PSMRI#26) * Merged conflicts resolved for admin develop branch (PSMRI#22) * customization changes * modified change * CSS changes * some modified changes * CSS changes * custom changes * validations for project msaster name and field title addition * small change * resolved the bug fixes for customization admin * logic implementation on project-serviceline-mapping * change in logic for datasource for project-serviceline-mapping * added validation for fieldName * Bug fixes for admin customization * Small change in project serviceline * Change in update request object * CSS CHNAGES * project serviceline mapping changes * Error issue * Error issue * CSS Changes * css changes * CSS chnages * CSS chnages * CSS chnages * CSS chnages * CSS chnages * Update environment.ci.ts.template * CSS chnages * CSS changes * CSS changes * Bug fix for update in emplopyee master * change in index file for console.warn --------- Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> * ANM- 942: Location serviceline userid passing incorrect --------- Co-authored-by: Parth Kothari <109517053+KpParth@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> * URL changes using jboss context-root * Minor change in angular.json * Minor changes * abdm facility addition changes in job location mapping * Service line filteration changes in institution screens * Service line filteration changes in institution screens (PSMRI#31) * Changes in Item Master screen * AMM-1001 Item Master Screen Changes (PSMRI#35) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * AMM-1020 & AMM-1025 (PSMRI#37) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * AMM-1022 procedure component mapping changes (PSMRI#38) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * Project configuration changes * AMM-1036 Project configuration changes (PSMRI#39) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * Project configuration changes * Add ESLint and NPM Audit workflow * User role agent Id mapping changes * Minor changes * AMM-993 User role agent Id mapping changes (PSMRI#42) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * Project configuration changes * User role agent Id mapping changes * Minor changes * Update environment.ci.ts.template * Update environment.ci.ts.template * modified environment.ci.ts.template * In Table search changes * Minor changes * Remove extra / from ci environment --------- Co-authored-by: Parth Kothari <109517053+KpParth@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> Co-authored-by: devikasuresh20 <devika.s36@wipro.com> Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com> Co-authored-by: Soham Gupta <soham.gupta003@gmail.com> Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>
helenKaryamsetty
added a commit
that referenced
this pull request
Mar 20, 2025
* Abdm facility (#1) * ANM - 942 userId passing wrong (#26) * Merged conflicts resolved for admin develop branch (#22) * customization changes * modified change * CSS changes * some modified changes * CSS changes * custom changes * validations for project msaster name and field title addition * small change * resolved the bug fixes for customization admin * logic implementation on project-serviceline-mapping * change in logic for datasource for project-serviceline-mapping * added validation for fieldName * Bug fixes for admin customization * Small change in project serviceline * Change in update request object * CSS CHNAGES * project serviceline mapping changes * Error issue * Error issue * CSS Changes * css changes * CSS chnages * CSS chnages * CSS chnages * CSS chnages * CSS chnages * Update environment.ci.ts.template * CSS chnages * CSS changes * CSS changes * Bug fix for update in emplopyee master * change in index file for console.warn --------- Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> * ANM- 942: Location serviceline userid passing incorrect --------- Co-authored-by: Parth Kothari <109517053+KpParth@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> * URL changes using jboss context-root * Minor change in angular.json * Minor changes * abdm facility addition changes in job location mapping * Service line filteration changes in institution screens * Service line filteration changes in institution screens (#31) * Changes in Item Master screen * AMM-1001 Item Master Screen Changes (#35) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * AMM-1020 & AMM-1025 (#37) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * AMM-1022 procedure component mapping changes (#38) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * Project configuration changes * AMM-1036 Project configuration changes (#39) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * Project configuration changes * Add ESLint and NPM Audit workflow * User role agent Id mapping changes * Minor changes * AMM-993 User role agent Id mapping changes (#42) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * Project configuration changes * User role agent Id mapping changes * Minor changes * Update environment.ci.ts.template * Update environment.ci.ts.template * modified environment.ci.ts.template * In Table search changes * Minor changes * Remove extra / from ci environment --------- Co-authored-by: Parth Kothari <109517053+KpParth@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> Co-authored-by: devikasuresh20 <devika.s36@wipro.com> Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com> Co-authored-by: Soham Gupta <soham.gupta003@gmail.com> Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> * Abdm facility (#2) * ANM - 942 userId passing wrong (#26) * Merged conflicts resolved for admin develop branch (#22) * customization changes * modified change * CSS changes * some modified changes * CSS changes * custom changes * validations for project msaster name and field title addition * small change * resolved the bug fixes for customization admin * logic implementation on project-serviceline-mapping * change in logic for datasource for project-serviceline-mapping * added validation for fieldName * Bug fixes for admin customization * Small change in project serviceline * Change in update request object * CSS CHNAGES * project serviceline mapping changes * Error issue * Error issue * CSS Changes * css changes * CSS chnages * CSS chnages * CSS chnages * CSS chnages * CSS chnages * Update environment.ci.ts.template * CSS chnages * CSS changes * CSS changes * Bug fix for update in emplopyee master * change in index file for console.warn --------- Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> * ANM- 942: Location serviceline userid passing incorrect --------- Co-authored-by: Parth Kothari <109517053+KpParth@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> * URL changes using jboss context-root * Minor change in angular.json * Minor changes * abdm facility addition changes in job location mapping * Service line filteration changes in institution screens * Service line filteration changes in institution screens (#31) * Changes in Item Master screen * AMM-1001 Item Master Screen Changes (#35) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * AMM-1020 & AMM-1025 (#37) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * AMM-1022 procedure component mapping changes (#38) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * Project configuration changes * AMM-1036 Project configuration changes (#39) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * Project configuration changes * Add ESLint and NPM Audit workflow * User role agent Id mapping changes * Minor changes * AMM-993 User role agent Id mapping changes (#42) * Service line filteration changes in institution screens * Changes in Item Master screen * Main store-sub store and project related changes * procedure component mapping changes * Project configuration changes * User role agent Id mapping changes * Minor changes * Update environment.ci.ts.template * Update environment.ci.ts.template * modified environment.ci.ts.template * In Table search changes * Minor changes * Remove extra / from ci environment --------- Co-authored-by: Parth Kothari <109517053+KpParth@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> Co-authored-by: devikasuresh20 <devika.s36@wipro.com> Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com> Co-authored-by: Soham Gupta <soham.gupta003@gmail.com> Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> --------- Co-authored-by: Parth Kothari <109517053+KpParth@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <KA40094929@wipro.com> Co-authored-by: nkokkiligadda87 <nkokkiligadda87@gmail.com> Co-authored-by: Pratibha <bhallamudi.pratibha@wipro.com> Co-authored-by: Parth Kothari <pa20251871@wipro.com> Co-authored-by: Ancy Riju <AN40085822@wipro.com> Co-authored-by: Shakyan Kushwaha <32445019+anandamideShakyan@users.noreply.github.com> Co-authored-by: Mithun James <drtechie@users.noreply.github.com> Co-authored-by: devikasuresh20 <devika.s36@wipro.com> Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com> Co-authored-by: Soham Gupta <soham.gupta003@gmail.com> Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.