Master dev sync 040124 #392
Merged
Conversation
This file contains 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
nipunarora-eGov
requested review from
sathishp-eGov and
jagankumar-egov
as code owners
hridya-egov
added a commit
to hridya-egov/SANITATION
that referenced
this pull request
Apr 3, 2024
* fixing tqm bugs * SM-3689: SW fixes and TQM sla fix * Merge pull request egovernments#380 from egovernments/SM-3689 SM-3689: SW fixes and TQM sla fix * minor fixes * fixes * Update DateRangeNew.js * fixed count 0 issue in inbox * updated css * SW fixes * Merge pull request egovernments#382 from egovernments/SM-3689 SW fixes * SW fixes * Merge pull request egovernments#384 from egovernments/SM-3689 SW fixes * SW * SM-3706 * Merge pull request egovernments#385 from egovernments/SM-3706 SM-3706 * fixing pqm * SM-3706 * SM-3706 * SW fixes * SW fixes * SW fixes * #SM-3241 merge develop to master * remove test inbox api * #SM-3241 indentation * SM-3646 * master inbox fixes * Master dev sync 040124 (egovernments#392) * SW fixes * SW fixes * SM-3646: UI UX AUDIT * SM-3646: UI UX AUDIT * merge * resolving commit SM-3646 * resolving commit SM-3646 * Merge pull request egovernments#389 from egovernments/SM-3646-dev Sm 3646 dev --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Readme changes for PQM * Readme changes for PQM Anomaly finder * Readme changes for PQM Scheduler * Readme changes - Renaming DB UML Diagrams to DB ER Diagrams * Readme changes - Renaming DB UML Diagrams to DB ER Diagrams * Readme changes - Renaming DB UML Diagrams to DB ER Diagrams * Swagger API Contracts * Reverting Swagger API Contracts for FSM and Vendor * Reverting Swagger API Contracts for FSM and Vendor * Reverting Swagger API Contracts for FSM and Vendor * Reverting Swagger API Contracts for FSM and Vendor * Master dev sync (egovernments#395) * SM-3720: SW bugs * Merge pull request egovernments#393 from egovernments/SM-3720 SM-3720: SW bugs * Update overridestyles.scss * Merge branch 'develop' of https://github.com/egovernments/SANITATION into develop * updated css version * SM:3725 --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> * Changing scheduled date with test submitted date. * Adding logic for sending notification based on origin * #SM-3730 modified user event * #SM-3730 modified user event * #SM-3730 modified user event * #SM-3730 removed comments * change to lastModified * Master develop UI sync (egovernments#408) * SM-3720: SW bugs * Merge pull request egovernments#393 from egovernments/SM-3720 SM-3720: SW bugs * Update overridestyles.scss * Merge branch 'develop' of https://github.com/egovernments/SANITATION into develop * updated css version * SM:3725 * SM-3720: Role * Merge pull request egovernments#396 from egovernments/SM-3720 SM-3720: Role * SM-3720: remove sys role default * Merge pull request egovernments#398 from egovernments/SM-3720 SM-3720: remove sys role default * Count 0 issue * Clear All fix * sla incorrect fix * Date Range Comp fix * Merge branch 'develop' of https://github.com/egovernments/SANITATION into develop * ui ux fix * Merge pull request egovernments#401 from egovernments/SM-UI-UX ui ux fix * ui ux fix * Merge pull request egovernments#402 from egovernments/SM-UI-UX ui ux fix * Prod fixes (egovernments#403) * Update TestDetails.js * Update FsmCard.js * Update viewTestSummary.js * Update TqmHome.js * Update index.js * Update TestDetails.js * prod-fixes-v2 * Update index.js * css upgrade * Update index.js * Adhoc changes --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> * Master<-develop UI sync (egovernments#409) * Update index.js * Adhoc changes * Fixed infinite loading issue * SW details page issue * Update EditWorker.js * Update TestDetails.js * Removed dummy createWithWorkflow controller * Master dev sync 16 (egovernments#416) * Update TqmAdminNotification.js * bug bash fixes (egovernments#414) * SM-3883 resolving dso search (egovernments#415) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Update UICustomizations.js --------- Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Changes for pdf wrapper API * SM-3677 Adding pagination object * SM-3677 Adding pagination object * SM-3677 Updating Egov Pdf Response object * Master dev sync 17 (egovernments#420) * Sm 3833 (egovernments#417) * SM-3883 resolving dso search * SM-3883 WF timeline fixes for comments * SM-3883 WF timeline fixes for comments --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * SM-3883 dso issue fix * Merge pull request egovernments#418 from egovernments/SM-3883 SM-3883 dso issue fix --------- Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * SM-3833: Inbox filter ui issues fix * SM-3833: Inbox filter ui issues fix (egovernments#421) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * SM-3837: inbox search issue fix * #SM-3668 move mdms plantInfo to mmdms v2 * #SM-3668 modified code * Update application.properties * Update application.properties * Master dev sync 19 (egovernments#428) * Sm 3833 (egovernments#417) * SM-3883 resolving dso search * SM-3883 WF timeline fixes for comments * SM-3883 WF timeline fixes for comments --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * SM-3883 dso issue fix * Merge pull request egovernments#418 from egovernments/SM-3883 SM-3883 dso issue fix * SM-3833: logout harcoded fix, comment timeline fix * SM-3839: TQM PDF download * SM-3839: TQM PDF download * Merge pull request egovernments#423 from egovernments/SM-3833-dev SM-3833: logout harcoded fix, comment timeline fix * SM-3833 reverting core version * Merge pull request egovernments#426 from egovernments/SM-3833-dev SM-3833 reverting core version --------- Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Sw sync (egovernments#429) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * SM-3845: fsm breadcrumb issue fix * SM-3845: fsm breadcrumb issue fix (egovernments#430) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * sm-3854 * fsm filter fix (egovernments#436) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * pdf download fix * Master dev sync UI patch Features (30th Jan) (egovernments#457) * SM-3845: fsm breadcrumb issue fix (egovernments#431) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Sm 3845 (egovernments#433) * SM-3845: fsm breadcrumb issue fix * sm3854 --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * tqm fixes * Merge pull request egovernments#434 from egovernments/sm-3854-dev tqm fixes * FSM inbox filter fix * Merge pull request egovernments#435 from egovernments/sm-3854-dev FSM inbox filter fix * Update configPlantOperator.js (egovernments#439) * FSM inbox filter fix * Merge pull request egovernments#435 from egovernments/sm-3854-dev FSM inbox filter fix * Merge pull request egovernments#425 from egovernments/rnd-dev Rnd dev * SM-3678 pdf download uat issue * Merge pull request egovernments#437 from egovernments/SM-3678 SM-3678 pdf download uat issue * Update configPlantOperator.js (egovernments#439) * FSM collect payment handle and tqm ui ux fixes * Merge pull request egovernments#440 from egovernments/SM-3804 FSM collect payment handle and tqm ui ux fixes * DPG-2151: tqm responsiveness (egovernments#441) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Sm 2151 (egovernments#442) * DPG-2151: tqm responsiveness * DPG-2151: tqm resp --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * SM-3838: logout fixes (egovernments#444) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * DPG-2038: Scroll Persistent Feature added (egovernments#449) * DPG-2038: Scroll Persistent Feature added * DPG-2038: Added comments for scroll persistent --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * TQM Patch features (egovernments#453) * patch initial commit * Showing removable breadcrumbs in InboxSearchComposer * configs change * Synced Session for mobile and desktop screens and added logic to clear session * Added session clear logic * Updated api calling logic from state instead of config * Mobile responsiveness for TQM Inbox/search screens * Updated css version * Tqm pagination fix + FSM inbox backward compatibility changes (egovernments#445) * pagination fixes * Update UICustomizations.js * backward compatible changes for fsm inbox * Validation coming on 2nd search fix * Update UploadFileComposer.js * Pagination coming in decimal * Adhoc fixes * Updated css version * Create Adhoc Test session integration * Session Integration for Update Test * Update CreateAddTestResult.js * Changes column to last updated time * Label changes * Update ConfigUlbAdmin.js * workflow statuses to be shown as crumbs fixes * Update TestStandard.js * core version update * SM-3717: add css for core ui fixes * SM-3717: add css for core ui fixes * SM-3717: css upgrade * css update * SM-3717: fixing multiselect --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> * Removed removable tags for sort * Create Adhoc Test session fixes --------- Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * sm-3596: added vehicle tracking build config * Master dev sync 1st Feb (egovernments#468) * Sanitation worker skills update + sidebar overlap fixes (core version upgrade) (egovernments#458) * patch initial commit * Showing removable breadcrumbs in InboxSearchComposer * configs change * Synced Session for mobile and desktop screens and added logic to clear session * Added session clear logic * Updated api calling logic from state instead of config * Mobile responsiveness for TQM Inbox/search screens * Updated css version * Tqm pagination fix + FSM inbox backward compatibility changes (egovernments#445) * pagination fixes * Update UICustomizations.js * backward compatible changes for fsm inbox * Validation coming on 2nd search fix * Update UploadFileComposer.js * Pagination coming in decimal * Adhoc fixes * Updated css version * Create Adhoc Test session integration * Session Integration for Update Test * Update CreateAddTestResult.js * Changes column to last updated time * Label changes * Update ConfigUlbAdmin.js * workflow statuses to be shown as crumbs fixes * Update TestStandard.js * core version update * SM-3717: add css for core ui fixes * SM-3717: add css for core ui fixes * SM-3717: css upgrade * css update * SM-3717: fixing multiselect * SM-3826 SW Skills issue fix/DPG-2150: Sidebar issue fix * SM-3826 SW Skills issue fix/DPG-2150: Sidebar issue fix * SM-3826 SW Skills issue fix/DPG-2150: Sidebar issue fix * SM-3717 --------- Co-authored-by: Nipun Arora <aroranipun1@gmail.com> Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Unique quality criteria fix * code quality update * SM-3717: SW vendor details screen change * SM-3717: SW vendor details screen change * SM-3717: SW vendor details screen change (egovernments#463) * SM-3717: SW vendor details screen change * SM-3717: SW vendor details screen change --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * SM-3717: CSS upgrade * Merge branch 'develop' into SM-3717 * Merge pull request egovernments#465 from egovernments/SM-3717 Sm 3717 * SM-3171: filter worker on basis of employer type * Merge pull request egovernments#466 from egovernments/SM-3171 SM-3171: filter worker on basis of employer type * Create Adhoc session fixes * Merge branch 'develop' of https://github.com/egovernments/SANITATION into develop * SM-3171: label change * SM-3171: label change * Merge pull request egovernments#467 from egovernments/SM-3171 SM-3171: label change * Create Adhoc Test session fixes * Merge branch 'develop' of https://github.com/egovernments/SANITATION into develop * Revert "Merge branch 'develop' into SM-3717" This reverts commit dab4965. --------- Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * SM-3890 (egovernments#469) * SM-3596: build configs * Master dev sync 02 02: Patch release complete (egovernments#477) * Create Adhoc test unnnecessary params getting saved fix * SM-3892: add worker modal fix * Merge pull request egovernments#472 from egovernments/SM-3892 SM-3892: add worker modal fix * SM-3717: SW DISABLE LOCALISATION CODE CHANGE * SM-3895: fixes * Marking workers as inactive when ADMIN sends back * Merge pull request egovernments#475 from egovernments/fsm-send-back-fix Marking workers as inactive when ADMIN sends back * DPG-2197: Adhoc session fixes (egovernments#476) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> * Added TQM config build-config.yml * Master dev sync 09 02 (egovernments#487) * SM-3889: TQM ADMIN session fixes * merge conflict fix * Merge pull request egovernments#478 from egovernments/DPG-2197 SM-3889: TQM ADMIN SESSION FIX * DPG: 2200, Inbox offset issue, and scroll reset issue fix * DPG-2200: inbox offset fix * SM-3884: Scroll persistent wheel listener added to avoid scroll calls when mounting * Merge branch 'develop' into DPG-2200 * Merge pull request egovernments#484 from egovernments/DPG-2200 SM-3884: Scroll persistent wheel listener added to avoid scroll calls when mount --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> * Syncing master with develop * pqm service changes for save-as-draft, fsm 1.4 bugbash fixes * bugbash-changes * removed eclipse settings files and target folder * version update to 1.4 pom.xml * bug bash issue fixes on anomaly finder * Added jsonpath * Added jsonpath * reverted requestinfo --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> Co-authored-by: Nipun Arora <aroranipun1@gmail.com> Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Co-authored-by: JithendarKumar-eGov <jithendar.k@egovernments.org> Co-authored-by: Priyanka-eGov <priyanka@egovernments.org> Co-authored-by: SivajiGanesh Nangireddy <142795334+sivajiganesh-egov@users.noreply.github.com> Co-authored-by: JithendarKumar-eGov <103918846+JithendarKumar-eGov@users.noreply.github.com> Co-authored-by: Priyanka-eGov <74049060+Priyanka-eGov@users.noreply.github.com> Co-authored-by: SivajiGanesh Nangireddy <sivaji.ganesh@egovernments.org> Co-authored-by: Anil Singha <99383116+anilsingha-eGov@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.