Skip to content

Commit

Permalink
2.9-beta Urban Code merge from DIGIT-Dev master (#81)
Browse files Browse the repository at this point in the history
* UM-5301 : TL updated the mdms and validation condition in units (#4675)

* UM-5301 : TL updated the mdms and validation condition in units

* UM-5301 : Created new component for inital units code logic

* Pay now link changed (#4677)

* Master 5270 (#4678)

* migration file renamed

* migration file fix

* UM-5301 : TL UI solved the issue of cache value for new application creation (#4728)

* UM-5297 OBPS::citizen::After clicking on view applications by citizen redirecting to something went wrong screen (#4729)

* Added permanentAddress for unmasking (#4730)

* Updated WnS Modify Application validation condition (#4731)

* UM-5315, UM-5311 mCollect::Toast message not showing (#4732)

* UM-5315, UM-5311 mCollect::Toast message not showing

* UM-5315, UM-5311 updated versions

* UM-5134 the disconnection calculation change (#4733)

* UM-5314 Added effective date from for dicsonnection

* UM-5314 Added math absolute for disconnection calculation

* UM-5134 Corrected calculation logic for disconnection (#4734)

* UM-5134 Changed the condition for calculation

* UM-5314 corrected the calculation logic

* UM-5314 chnaged demand search url param

* UM-5314 Changed the billing service ulr params fro demand search

* Resolved calculation logic for disconnection

* Changed the name of constant status

* UM-5314 Changed the constant name of the status

* Support for (#4742)

amendmentreason,reasondocumentnumber,effectivefrom,effectivetill in
amendmentUpdateRequest

* [UM-5313]-Added changes for AmendmentUpdate query (#4744)

* Added changes for AmendmentUpdate query

* Update

* Update CODEOWNERS

* Update CODEOWNERS

* Update CODEOWNERS

* Update CODEOWNERS

* Update CODEOWNERS

* [UM-5320]-WnS Payment Notifications For Disconnection (#4749)

* WnS Payment Notifications For Disconnection

* SW Payment Notif update

* Comments updated for condition

* Update CODEOWNERS

* Update CODEOWNERS

* UM-5339,UM-5323, UM-5324 hot fixes (#4753)

* [UM-5280]-Changed DonloadReceipt links for notifications (#4754)

* Update CODEOWNERS

* Update CODEOWNERS

* UM-5357, UM-5325 W&S :: Resubmit is not working for WnS new connection (#4760)

* UM-5349 W&S :: Connections additional details are not reflected on Citizen (#4762)

* [UM-5330,UM-5329,UM-5326,UM-5346] : TL UI employee and citizen, new application and renewal bug fixes (#4769)

* Added isAudit condition for property search decryption condition (#4768)

* Updated search for consumerCode (#4771)

* [UM-5328]-Changes for WnS email notifications. (#4761)

* Changes for WnS email notifications.
1.) The email notifications are triggering as expected
2.) Notification/sms/mail is being triggered for the 0 amount in
disconnection
3.) If the amount of demand generated or meter reading is added to be
collected, then that has to be redirected to my bills -->Bill details (
but it's redirecting to the applications page)

* Updated receipt link

* Updated application download link with application details link

* Removed commented code.

* Updated message template for payment email notif

* UM-5334 inbox api failing when trying to search for invalid applications (#4767)

* UM-5334 replacing stream with for loop for empty processinstance search results.

* UM-5345 changing class type

* UM-5345 adding null check above for loop

* UM-5345 removing comments and empty check for process instance

* UM-5345 refractoring code

* Updated open rowmapper (#4774)

* UM-5345 sending notification for only primary owner (#4764)

* Updated connectiondetails old UI link to new UI link (#4775)

* UM-5335 moving unique mobileno validation above enrichment call (#4776)

* UM-5335 moving unique mobileno validation above enrichment call

* UM-5335 moving unique mobileno validation above enrichment call

* UM-5333, UM-5344 OBPS::Not showing the application details proper after stake holder registration (#4777)

* [UM-5329,UM-5348,UM-5363] : TL fixes for units and acessories for create and renewal flow (#4778)

* UM-5333 updated versions of obps (#4779)

* UM-5333 OBPS::Not showing the application details proper after stake holder registration (#4780)

* UM-5333 updated versions of obps

* UM-5333 OBPS::Not showing the application details proper after stake holder registration

* Notif ws issues resolved (#4782)

* Conditon for 0 payment bill generation

* Notif links and disconn edit template issue resolved

* [UM-5329,UM-5337,UM-5349] : WS TL UI fixes, billing slab error fixes and connection details changes (#4781)

* UM-5327 Disconnection Calculation changes (#4763)

* UM-5327 Added the code for disconnection demand creation

* UM-5327 Added decimal value in condition

* UM-5327 Added else if condition for disconnection demand generation

* UM-5327 Changed demand search url for disconnection

* UM-5327 Demand generate changes

* UM-5327 Added the demand generation calculations for sewerage

Co-authored-by: hinamakhija-eGov <hina.makhija@egovernments.org>

* Changed the metered billing code for disconnection (#4783)

* UM-5458, UM-5470 OBPS::citizen:: showing applications which were created with another number (#4784)

* UM-5458 Updated OBPS version (#4788)

* Added division logic (#4785)

* UM-5458 Updated OBPS versions (#4789)

* [UM-5326] : fixed the address component when redirection from property in TL and employee billing slab issue fix while renewal (#4787)

* [UM-5332,UM-5459,UM-5445,UM-5480] : PT mutation transferror details fix in check page,OBPS cache issue in bpareg in obps, WS disconnection payment update fix for partial payment, TL fix for workflow documents no present in citizen side (#4790)

* UM-5361 : TL accessory input fix while renewal (#4795)

* OBPS version upgraded. (#4793)

* OBPS version upgrated.

* OBPS version updated

* [UM-5459,UM-5477,UM-5482] : OBPS Issue rerading worflow timeline, alignment issue in inbox and cache issue are fixed (#4797)

* UM-5482 : OBPS Increment version and removed extra console.log (#4803)

* Added exception for division logic (#4798)

* UM-5489 OBPS & TL:: Report issues (#4806)

* [UM-5501,UM-5496] : PGR style issue fixed and obps edit issues fixed for locality (#4807)

* [UM-5496,UM-5497,5504] : TL create flow fixes and obps fix for pincode and oc and permit flow (#4809)

* UM-5489 OBPS & TL:: Report issues (#4810)

* UM-5489 OBPS & TL:: Report issues

* UM-5489 OBPS & TL:: Report issues

* UM-5489 OBPS & TL:: Report issues (#4813)

* [UM-5505,UM-5506] : TL UI fixes for create and renewal (#4815)

* [UM-5523,UM-5524,UM-5525,UM-5508] : TL fixes for renewal flow and ws fixes (#4816)

* [UM-5524,UM-5526] : TL renewal fixes corrosponding to property and ot… (#4821)

* [UM-5524,UM-5526] : TL renewal fixes corrosponding to property and other small fixes

* TL Renewal undefined error fix

* Calculation update for final charges of W&S disconnection applications (#4824)

* UM-5526 : TL fixes for renewal and edit flow from send back from DV (#4825)

* UM-5531 OBPS::showing incorrect architect name (#4826)

* asasdsad

* UM-5531 OBPS::showing incorrect architect name

* [UM-5012] : TL UI consumer number integration in inbox (#4828)

* Added null checks to Property owner details (#4829)

* Updating the select street component from fsm to tl (#4831)

* TL Fix for build in components (#4833)

* UM-5477 OBPS:: Inbox Application status option not showing the count and not aligned proper (#4834)

* UM-5477 OBPS:: Inbox Application status option not showing the count and not aligned proper

* UM-5477 OBPS:: Inbox Application status option not showing the count …

* Removed Sewerage cess from sewerage disconnection calculation (#4835)

* [UM-5012] : added consumer field to bill amendment screen and send back to citizen fixes for TL (#4840)

* TL WS fix for send back to citizen and pdf issue (#4842)

* [UM-5337,UM-5356] : OBPS fix related to edit if edcr search and 3rd and 4th fix for product sepcific pages (#4847)

* [UM-5548,UM-5543,UM-5545] : OBPS alignment and tl renewal issue fix (#4849)

* UM-5524 : TL fix for citizen renewal property change and routing (#4859)

* [UM-5556,UM-5557] : TL application type update for search result, consumer code change from cronsumer number in Bill Amendment inbox, WS adding of scroll bar in inbox (#4863)

* updated consumerCode param for Bill Amendment inbox (#4866)

* TL UI fix for edit renewal in citizen side (#4871)

* OBPS:StakeHolders Notifications-Event and Email Notifications Changes (#4880)

* [UM-5539] : WS APK issues employee side and tl renewal issue (#4881)

* UM-5536 TL:Reports::when searching TL Reports screen getting stuck & taking a long time to get search results and navigating to other report screens

* UM-5536 :: Fixed Report issue loading issue , incorporated the TL Pending report Elapsed time red color column and show NA if value is null and - in case of Number Null

* UM-5531 OBPS::showing incorrect architect name (#4885)

* #SM-1705 provision to dso to create application with his number (#4887)

* #SM-1705 Submitted applications from ULB side do not show at FSTP account

* #SM-1688 and #SM-1705 given provision to dso to create application as a citizen

* UM-5536 adding payment link replacement in email notif (#4886)

* [UM-5539] : WS APK alignment fix and mobile number redirection (#4889)

* [UM-5568] - Updated Payment notifications logic to fetch emails using uuids (#4890)

* changed code for payment notifications

* Update

* Updated Payment notif logic for Sewerage flow

* _encryptOldData update- added support for tenantIds search (#4891)

* Added tenantId support for oldDataEncryption service.

* Updated mdms state search method

* Updated finalList response of property and sewerage.

* Removed splitting of tenantId in mdms search

* Added check for plumberInfo for modify and disconnection flows (#4896)

* UM-5570, UM-5573, UM-5575 OBPS::APK::stakeholder flow UI issues (#4897)

* [UM-5539,UM-5560,UM-5564] : WS Product Specific pages and Bill Amendm… (#4899)

* [UM-5539,UM-5560,UM-5564] : WS Product Specific pages and Bill Amendment APK issues fixes

* Update useInboxMobileCardsData.js

* SM-1134: UAT Blank page is displayed when FSTPO clicks on Add New Vehicle Entry (#4898)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* UM-5511, UM-5536 :: Report loading issue, localisation prefix issue , application status custom logic added

* UM-5575 OBPS::APK::Alignment issues in permit & OC flows (#4902)

* UM-5511 : Report localisation issue fix to work even with no localisationPrefix

* [UM-5539,UM-5560] : WS phone number redirection in apk, & product sepcific pages down arrow alignment (#4904)

* enc missing flow fix (#4905)

Co-authored-by: kavi_elrey <25226238+kavi-egov@users.noreply.github.com>

* UM-5575 updated css version (#4906)

* [UM-5565,UM-5539] : WS Fixes in bill amendment and PT fixes in APK (#4907)

* [UM-5565,UM-5539] : WS Fixes in bill amendment and PT fixes in APK

* TL alignment fix in create screen

* UM-5575 OBPS APK issues (#4910)

* [UM-5579] - Fuzzy search fix (#4908)

* Added data push to fuzzy topic

* Push data for fuzzy search

* PT fuzzy search url changed

* Updated fuzzy search data push for _create api

* [UM-5539,UM-5584] : bill amendment amount fix and scrolling fix in inbox tl (#4911)

* Added decryption for pt fuzy search (#4912)

* UM-5539 : Redirection of mobile number after unmasking (#4914)

* [UM-5603,UM-5539] : Bill Amendment removed the redirection link from inbox and redirection of mobile number fix (#4915)

* UM-5600 Missing localisation key_permit conditions (#4916)

* UM-5600 Missing localisation key_permit conditions (#4917)

* UM-5600 Missing localisation key_permit conditions

* UM-5600 Missing localisation key_permit conditions

* [UM-5607] : able to delete right question, survey details fix (#4920)

* [UM-5613] : Survey UI fix for multiple and checkbox option in hindi (#4921)

* [UM-5607] : survey edit screen different question (#4922)

* UM-5598 removing static URLs from Inapp Notifications for OBPS and Stakeholder Flow (#4913)

* UM-5598 removing static links from obps inapp notifications

* UM-5598 removing static links from obps stakeholder inapp notifications

* UM-5598 adding action button for Portal link

* UM-5598 adding action button for Portal link

* [UM-5611,UM-5356] : Survey fix for owner in result view and channel from citizen side

* UM-5572 :: Download issue fix for download certificate

* UM-5592 OBPS and NOC hot fixes (#4930)

* [UM-5620,UM-5621] : Survey UI employee side fixes (#4931)

* [UM-5620,UM-5621] : Survey UI employee side fixes

* [UM-5620] : survey UI updated the width for dropdown question

* Update HomePageWrapper.scss

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* UM-5594, UM-5622, UM-5593 eDCR search_disabled if wrong value is entered (#4932)

* UM-5596, UM-5622 fire NOC::Issues in create application (#4933)

* UM-5622 fire NOC::Issues in create application (#4934)

* DPG-1197 :: Core Update Password Update index.js (#4938)

updated the url for change password

* [UM-5629] : SURVEY UI Adding validation for name for edit flow (#4940)

* UM-5589 Fire NOC is having application view as a link in the doc attachment (#4941)

* UM-5251 Inbox: "Assign to me" Filter not working (#4942)

* Removed isAudit condition for decryption in search call (#4944)

* Update old-property encryption in update flow (#4947)

* [UM-5627,UM-5630] : Survey UI api request param added and PT UI fix for citizen error (#4945)

* UM-5599 added mobile number in the search request (#4950)

* [UM-5624,UM-5634] : Survey UI edit flow fixes for duplicate name, result view email id not showing fix and citizen respond UI validation from notification fix (#4948)

* UM-5322 PT: Mutation flow: In Acknowledgement Form only one Transferor Details are present. (#4951)

* UM-5599 removing uuid from search criteria while searching with mobil… (#4949)

* UM-5599 removing uuid from search criteria while searching with mobilenumber

* UM-5599 Removing commented code

* UM-5595 : UI side bar is getting scrolled to top (resetting to default) whenever opened (#4952)

* UM-5638 FireNOc::citizen::create application issues (#4953)

* UM-5322 PT: Mutation flow: In Acknowledgement Form only one Transferor Details are present. (#4958)

* UM-5642 fire NOC:: Edit screen issues & building type issue (#4961)

* UM-5561 : Bill genie APK issue fixes (#4965)

* UM-5511 :: TL Report Application status custom change added

* UM-5614 User search host issue (#4957)

* UM-5614 adding logs

* UM-5614 removing '_beta' from version.

* UM-5614 adding logs

* UM-5614 adding logs

* UM-5614 adding logs

* UM-5614 changing User Host

* UM-5614 fixing search query's substring end-index

* UM-5614 removing logs

* UM-5614 adding AND to the created time were clause

* UM-5608 Airport NOC Update Issue (#4963)

* UM-5608 adding exception

* UM-5608 adding exception

* UM-5608 adding logs

* UM-5608 adding validation in update flow for auro approve Issue

* UM-5608 removing validations and logs that are not required

* [UM-5347] : OBPS UI made the button overlay for application details (#4971)

* cleanup

* Added audit table and updated topic name for data push in wns enc (#4959)

* UM-5648 returning if landinfo search with mobilenumber is empty (#4976)

* UM-5648 returning if landinfo search with mobilenumber is empty

* UM-5648 return empty list

* Improved _encryptOldData api for audit table data & disabled this api (#4982)

* Improved _encryptOldData api for audit table data & disabled this api

* added lastmodifiedtime back in the plainsearch query

* Update CHANGELOG.md

* Update pom.xml

* Commented the property enc code

---------

Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com>

* Updated pom versions and changelog.md files (#4985)

* [UM-5608] : OBPS UI adding validation before NOC update (#4974)

* [UM-5608] : OBPS UI adding validation before NOC update

* [UM-5608] : Updated the condition for Noc update calls and Added condition for privacy info tag in ws

* UM-5644, UM-5643 fire NOC::Not showing the information related to property details (#4991)

* UM-5635 : Survey UI changes regarding edit flow question array and obps fixes (#4992)

* UM-5634 : Survey UI, added the updated request params for MarkInactive, MarkActive and delete (#4994)

* UM-5669, UM-5649 OBPS::changes for search BPA Application in architect inbox (#4996)

* firenoc search fix (#4995)

Co-authored-by: kavi_elrey <25226238+kavi-egov@users.noreply.github.com>

* UM-5659 Firenoc citizen search changes (#4990)

* UM-5659 changes for citizen search with mobileno

* UM-5659 changing query and db response

* UM-5659 changing query and db response

* changing type of firenocIds to let

* UM-5659 modifying query

* importing function from utils

* UM-5659 formatting code and removing logs

* UM-5669 OBPS::changes for search BPA Application in architect inbox (#5004)

* UM-5663 fireNOC::create application flow issues (#5005)

* Updated versions for services (#5002)

* Updated versions for services

* Updated version and Changelog for municipal services

---------

Co-authored-by: Priyanka-eGov <priyanka@egovernments.org>

* added survey to master (#5013)

Co-authored-by: debasishchakraborty-egovt <debasish@egovernmets.org>

* UM-5655 : Added change (#5016)

Co-authored-by: debasishchakraborty-egovt <debasish@egovernmets.org>

* Update UserService.java (#4972)

* UM-5683: added change to restrict send event to citizen if survey is not active. (#5018)

Co-authored-by: debasishchakraborty-egovt <debasish@egovernmets.org>

* UM-5650 : OBPS UI owner details added the validation for checking from database and architect supervisor role (#5020)

* UM-5644 fire NOC::Not showing the information related to property details (#5022)

* UM-5683: added change to restrict send event to citizen if survey is NOT ACTIVE (#5024)

* UM-5683: added change to restrict send event to citizen if survey is not active.

* UM-5683: added change to restrict send event to citizen if survey is not active.

* UM-5683: added change to restrict send event to citizen if survey is not active.

---------

Co-authored-by: debasishchakraborty-egovt <debasish@egovernmets.org>

* Removed _beta versions from business-services and utilities (#5017)

* UM-5685 : Survey UI redirectiong from notification of delete and active survey, required style componenet added (#5029)

* [DPG-959] Added bulk property pdf generation (#4756)

* UM-5615 : added changes in status message and status for sendVerification (#5031)

Co-authored-by: debasishchakraborty-egovt <debasish@egovernmets.org>

* UM-5684 FireNOC:: Issues in citizen & employee side (#5032)

* UM-5043 Sorting is disabled in reports. (#5034)

* UM-5043 Disabled only date sorting (#5035)

* UM-5585 : Product specific pages ::APK::Not able to play the video in how it works screen #5036

* masterFixForinappNotification: reverting changes now for both active and inactive survey will get notified (#5038)

Co-authored-by: debasishchakraborty-egovt <debasish@egovernmets.org>

* UM-5644 fire NOC::Not showing the information related to property details (#5040)

* [UM-5687,UM-5689] : Survey fixes UI employee and citizen side, review changes from PO (#5041)

* Pom and changelog changes for core-services (#5043)

* WS UI Fix for modify application (#5051)

* UM-443 added firenoc inbox (#5054)

* UM-5704 fireNOC::showing incorrect billing period after payment (#5055)

* UM-5644 fire NOC::Not showing the information related to property details (#5057)

* [DPG-1211,UM-5590] : updated the API curl for update password conditionally and corrected the validation for email in user profile update (#5056)

* UM-5642 Added condition for firenoc approver login (#5059)

* UM-5723 fireNOC::UI issues (#5062)

* Version updates of Old and New UI (#5070)

* Version updates of Old and New UI

* Updated DSS version of mono UI

* Updated Reports Versions

* Added ChangeLog file (#5074)

* UM-5728 fireNOC::If Number of basements is Zero it was not autopopulating in new with provision number & only at summary screen its showing (#5075)

* Added financial year logic for TL (#5076)

* Added financial year logic for TL

* Added financial year logic for TL

* UM-1308 OBPS_Application status report (#5078)

* UM-1308 OBPS_Application status report (#5097)

* Backend developer guide (#5067)

* Stage-1: Basic Developer Guide

* Stage-2: Integrated with IdGen Service

* Stage-2: Integrated with User Service

* Stage-2: Integrated with Workflow Service

* Stage-3: Integrated with Url Shortener

* Stage-3: Integrated Payment Back Update Consumer

* Stage-3: Added Indexer config

* Stage-3: Added certificate generation(pdf) config

* Stage-4: Added BTR Calculator

* Stage-4: Integrated with BTR Calculator

* Notification sw-calc (#5091)

* Updated Url shortener for sw calc

* Update

* UM-5726 Fire noc reports hot fixes (#5117)

* #SM-1902 fsm service code migration fron dev to uat (#5128)

* #SM-1902 fsm service code migration fron dev to uat

* #SM-1902 replace with existing one

* UM-5725 : Forgot password cache issue fixed without login (#5127)

* #SM-1910 code migration from dev to uat (#5132)

* #SM-1910 code migration from dev to uat

* #SM-1910 code migration from dev to uat

* #SM-1910 code migration from dev to uat

* #SM-1903 and SM-1911 develop to master merge (#5136)

* Sm 1911 Merging Dev code to Master Branch (#5149)

* #SM-1911 vehicle flyway issue fixed

* SM-1911 Pom file version change

* UI package dependency version incremented for 2.8

* [5754,5755,5756] :UI DSS total amount rounding amount fixed a… (#5146)

* [UM-5749,5754,5755,5756] :UI DSS total amount rounding amount fixed and PT usage category null value condition added and tl validation updated for institute name

* Reverting the changes of DSS 5749

* SM-1905,SM-1904: Code Migration from Dev to Master for v1.3 (FSM) (#5126)

* SM-1905: Migration from dev to master in progress for FSM

* SM-1905: css changes for FSM wip

* SM-1905: Css migration from dev to uat for FSM

* SM-1904: Code migration to master

* UI/UX +91 component fix

* SM-1905:Added css

* SM-1905:Removed hardcoded code

* SM-1905:Added unmask component

* SM-1905: Added fsm packages/fsm & build:fsm in package.json

* SM-1905: Updated veriosn +1

* SM-1905: Updated package.json

* SM-1905: Updated package.json

* SM-1905: Updated libraries version & common pacakge version by +1

* SM-1905: Added fsm modules in package.json

* SM-1905: Updated react componnets package.json +1

* SM-1905: Updated package.json

* SM-1904/SM-1905: Added pincode fix and +91 component

* SM-1905: Updated css version +1

* SM-1905: Updated index.html

* SM-1905: Added missing code for payment modules

* SM-1904: Resolving review comments

* SM-1904: Resolving PR comments

* SM-1904 CSS upgrade

---------
Co-authored-by: jagankumar-egov <jagan.kumar@egov.org.in>
Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* SM-1933: ULB: In UAT Collect payment page  showing NAN for Total Amount (#5165)

* SM-1933: Fixed total amount

* SM-1933: Fixed total amount

* SM-1941: FSTP, Zero Pricing, Back Button fix, TL component fix (#5167)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* SM-1938:UAT-Payment link crashing when opened on mobile  (#5171)

* SM:1938: Authorization bill payment WIP

* SM-1938: Fixed link url issue

* SM-1945/SM-1944: Localisation key fix and FSTP error message fix (#5174)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* Removed username&password from elasticsearch req headers for privacy-audit (#5178)

* Removed usernme and pwd from headers

* Removed username&password from elasticsearch req headers frprivacy-audit

* Added service-request build config (#5195)

* SM-1952/SM-1951/SM-1950/SM-1949: Date field disabled, future date fix, Back to vendor details fix (#5207)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* SM-1954/SM-1953: Collect screen owner mobile number showing fix, advance balance refetch when Locality change fix (#5215)

* SM-1954/SM-1953: Collect screen owner mobile number showing fix, advance balance refetch when Locality change fix

* SM-1953: adding comments

---------

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* required merge access (#5204)

* resolved conflicts

* #SM-421 modified change log (#5254)

* FSM Updated the Digit-ui package version to 1.6.1 (#5264)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* #SM-1982 provision to create dso fsm application from citizen side (#5306)

* #SM-1981 fixed my application list for dso in citizen portal (#5307)

* [UM-5923] : updating the name of selectereet componenet in TL (#5310)

* [UM-6013] : updated the conditional check for getting FY for request … (#5325)

* [UM-6013] : updated the conditional check for getting FY for request body

* UM-6013 : incremented the TL module version

* SM-2099/SM-2111/SM-1980: Remove Mobile number, payment method and pay now flow fix  (#5323)

* SM-2111: Pre Pay flow not working fix

* SM-2099 Remove Payment Type

* SM-1980 remove driver mobile number

* SM-2099

* SM-2099 package version upgrade

---------

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* SM-2111: Update trips post pay flow fixed (#5349)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* #SM-1980 Mobile Number sequence implemented for Driver (#5330)

* UM-6013 updated the version in web package in order to solve build issue (#5353)

* version update for libraries in web package.json

* version update for common and fsm in web package.json

* SM-2171, Vendor show NA when disable fixes (#5355)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* #SM-2110 fixed for old application (#5357)

* SM-1980: Driver Submit button fix (#5358)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* SM-2138 FSTO redirection page fix (#5364)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* #SM-2181 fixed for pre-pay application (#5369)

* SM-2197: DSO Pay action hide fix (#5373)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* SM-2196: Update application redirection fix (#5371)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* #SM-2130 modified query (#5374)

* #SM-2130 modified (#5377)

* SM-2141 clock icon disable fstp (#5387)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* #SM-2212 added citizen role for dso (#5389)

* #SM-2099 removed validation for received payment (#5386)

* SM-2225: Collect Payment Hide for dso (#5392)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* #SM-2249 fixed (#5408)

* UM-5999 Merging develop to master (#5422)

* DPG-957 : Basic backend Developer Guide (#4453)

* Stage-1: Basic Developer Guide

* Stage-2: Integrated with IdGen Service

* Stage-2: Integrated with User Service

* Stage-2: Integrated with Workflow Service

* Setting oldapplication to true when disconnection is executed (#4499)

* Setting oldapplication to true when disconnection is executed

* Added variable for action from request

* [UM-1265, UM-5159] Property payment event notification issue (#4505)

* UM-1265 incorporating decryption for property owners in assessment notification flow.

* UM-1265 adding import statement

* UM-1265 adding internal microservive user uuid

* UM-1265 unmasking owner details in property object

* UM-1265 modifying user search call for event notification to search by mobileno as username

* UM-1265 modifying user search call for event notification to search by mobileno as username

* UM-1265 adding try catch block

* UM-1265 removing getAllFieldsPlainAccessList function

* [UM-5157] - Updated models for user. (#4508)

* Updated Pagination for plainSearch(for oldData Encryption) (#4394)

* Updated Pagination for plainSearch(for oldData Encryption)

* Removed commented code

* Added prepay for citizen (#4521)

* #SM-1435 UI redirect citizen payment (#4525)

* Changed tenantId for Inbox encryption (#4534)

* UM-1280 WS Disconnection Notification changes (#4533)

* UM-1280 adding sw notification changes and removing stream for duplicate mobile numbers

* UM-1280 adding correct mapnames

* UM-1280 adding decryption for water connection holder and property owner object

* UM-1280 replacing unmasking method with decryption method

* UM-1280 changing decyption model name

* UM-1280 changing path for decryption

* UM-1280 resetting userinfo in requestinfo to original userinfo

* UM-1280 adding sw notification changes for event issue

* UM-1280 adding sw notification changes for event issue

* Pgr noc land (#4569)

* RAIN-4136:Mcollect few audit fixes (#1063)

* RAIN-3995: MY payments for property (#1061)

* RAIN-3995: MY payments for property

* RAIN-3995: Review changes and fixes

* RAIN-4136: Rremoved unwanted code

* RAIN-3944 :UI : SEARCH APPLICATION FOR PT(#1062)

* RAIN-3944 : SEARCH APPLICATION FOR PT

* unwanted code removed

* RAIN- 3993 :: UI Audit: Search Property [Citizen/ Employee] (#1064)

* PT EMP Search screen revamp

* PT Search screen formatted and integrated

* Added validation ,fixed form and added toast , roles

* EMployee Search screen modified and Mobileview enabled with all validations

* Modified css for the reset button employee

* form warning removed

* Correceted the links and added search links in home screen

* intermediate minor change for enable citizen

* citizen side search fields modified

* RAIN-3993 : PT Citizen search modified with latest search params

* RAIN-3993 : PT Citizen side search screen integraeted with all validations and localisations

* RAIN-3993: PT Search property enabled with search config

* Added Search App

* RAIN-4545 :: UI Audit: Update property application [Employee] (#1067)

* RAIN-4545 : Employee update property show the onwer details initial commit

* RAIN-4545 : Property update show owner data formated

* Update EditForm.js

* RAIN-3831 :: Citizen - View Property: Change mobile number (#1066)

* RAIN-3831 : PT Citizen update number feature

* RAIN-3831 : PT Update no popup integrated

* RAIN-3831 : PT Modified few alignments and integrated with login / authenticate/regisetr apis

* RAIN-3831 : PT Update no integrated with the Update proeprty api with all validations and toast messages

* RAIN-3831 : PT UPdate number citizen handled all uses case converted to reducer

* RAIN-3831 : PT Citizen update number added mdms config integration

* RAIN-3830 : PT Employee init commit of update no creation

* RAIN-3830 : PT EMployee code cleaned up and made seperate request

* RAIN-3830 : PT Update no integrated with EMployee

* RAIN-4583, RAIN-4585, RAIN-4586 WNS Intial commits (#1070)

* RAIN-3993 : PT AUdit search unit test issue fixed (#1071)

* RAIN-3993 : PT AUdit search unit test issue fixed

* removed log

* RAIN-4585 added WS Module in Package and app files (#1074)

* Update property-services.yml (#1080)

* [RAIN-4697]: Added null checks (#1078)

* [RAIN-4697]: Added null checks

* [RAIN-4717] : Fixed cron job bug

* [RAIN-4697] : Removed null checks

* Revert "[RAIN-4697] : Removed null checks"

This reverts commit 1c753273588c97a2e4fe644685c4b08169eeb77e.

* Revert "[RAIN-4697]: Added null checks"

This reverts commit 670feb9de5023d1ffced87a6270e666ea097909f.

* RAIN-3871 : PT My Payments integrated with the employee property info screen (#1083)

* RAIN-3871 : PT Payment details in employee

RAIN-4605 : PT Payment details screen added to the employee property info screen

* RAIN-3871 : PT My Payments integrated with the employee property info screen

* Update Receipts.js

* [RAIN-4719] : Added alternate mobile number to sms requests (#1088)

* fixed PGR RAIN-4703 by adding PDF identification util and adding that in PGR module (#1095)

* RAIN-4712 Fixed issue BPA inbox is not rendering when submit appln for (#1099)

multiple citiex

* RAIN-3553: WS Search & Pay - open & normal (#1097)

* RAIN-3553: WS Search & Pay - open & normal

* RAIN-3553: changing alert to Toast

* RAIN-3553: Review changes

* RAIN-3553: Review changes

* RAIN-4114 RAIN-4115: TL UI Audit task (#1073)

* code cleanup and RAIN-4114 RAIN-4115:

* removed debugger

* added fields for institutional details

* fixed create flow

* Added expired applications in search api (#1104)

* Added expired applications in search api

* Updated the query

* RAIN-3869 : PT Assessment screen citizen side enhancement for diff type proeprty (#1100)

* RAIN-3869 : PT UI AUdit - Integration with api for flat and vacant

RAIN-3869 : PT Assessment initial commit

RAIN-3869 : PT Units added for the flat type property

RAIN-3869 : PT Assessment flow modified for the units flat type property

RAIN-3869 : PT Independent property initial commit

* RAIN-3869 : PT Assessment land area issue fix for independent proper

* Fixed the independent proeprty create

* base ment enabled for create

* formating done and removed few loggers

* RAIN-3869 : PT Modified  for few review comments

* TL Search: Status fixes for different business services (#1111)

* Rain 3830:UI PT : Employee - View Property: Update mobile number (#1113)

* RAIN-3830 : PT Update no initial config

* RAIN-3830 : PT Update No field added for active property

* COde formatted

* Rain 4353 4311 4736:: UI Fixes on Mcollect and bpa inbox screens (#1117)

* fixed bug RAIN-4736

* fixed RAIN-4353, RAIN-4311

* RAIN-4745-4749: Close icon and refresh icon added in mobile view (#1119)

* RAIN-4690 adding offset and limit (#1090) (#1102)

* OBPS-TL : pincode cache problem fixed and TL localisation issue fixed (#1128)

* Rain 4415: UI : PT : COMMON Search screen created to be used by other modules (#1109)

* RAIN-4415 Screen 1 & Screen 2 OTP WIP

* RAIN-4415 Screen 3

* RAIN-4415

* RAIN-4415

* RAIN-4415 Add link success page

* RAIN-4415 Add missing route

* RAIN-4415 Search updates

* RAIN-4415 Create new property WIP

* RAIN-4415 Add common pt module

* ENabled commonpt module

* RAIN-4415 Updates to search functionality

* RAIN-4415 Moving all changes from pt to commonPt module and other changes

* RAIN-4415 Code review points

* REVERTED PT MODULE CHANGES

* Update index.js

* Added it in main app

* RAIN-4415 Add redirect url section

* RAIN-4415 Logic update for redirect url

Co-authored-by: shoaibsyed7 <79191374+shoaibsyed7@users.noreply.github.com>
Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* RAIN-4775-4776: OBPS BUGS STAKEHOLDER FIXES (#1130)

* Rain 4743 Fixed issue applications are not showing in newly registered architect in old UI (#1134)

* RAIN-4743 Fixed issue in newly registered architect login applications
are not showing

* RAIN-4743 Script to migrate appln type and service type for existing
applns

* RAIN-4008 WS Notification Enhancement (#1103)

* Changes for notification enhancement

* Changes for sw-service

* adding email topic

* changing email topic

* changes for ws billing and demand notif flow.

* changes for sw bill/demand notif flow

* changes for email notifications

* Changes for email notification

* PR review changes

* RAIN-4008 changing variable value (#1136)

* RAIN-4743 Fixed search issue with mobile no (#1137)

* RAIN-4791: Alignment in create challan fixed (#1140)

* RAIN-4766 trying to fix by specifying the react query version (#1143)

* RAIN-4465 changes for pt notification enhancement (#1142)

* UI FILE STORE API added Authtoken in header (#1146)

* Update UploadServices.js

* FILE STORE API added Authtoken in header

* RAIN-4757 Order the city drop down properly (#1148)

* Rain 4700 80s:: UI MCollect OBPS bugs fixes (#1147)

* RAIN-4750-85-88-90-92-4802 Mcollect and OBPS Bug Fixes

* RAIN-4802:  unwanted code removed

* RAIN-4770, RAIN-4771, RAIN-4773, RAIN-4774, RAIN-4778 issues fixed (#1152)

* RAIN-4709 changes for bpa custom indexer (#1151)

* UI-[RAIN-4758,RAIN-4759,RAIN-4789,RAIN-4793,RAIN-4794,RAIN-4795,RAIN-4804] : OBPS Bug Fixes (#1154)

* RAIN-[4758,4759,4789,4793,4794,4795,4804] : OBPS Bug Fixes

* [RAIN-4791,RAIN-4793,RAIN-4803] : Feedback Changes

* RAIN-4782 Fixed issue with search criteria showing wrong result (#1155)

* RAIN-4782 Catch filestore API exception

* RAIN-4782 Add stakeholder search with userid

* RAIN-4779, RAIN-4772, RAIN-4810,RAIN-4909 PDF Icon issues fixed throughout the modules and file names as well and assignee name, blocker issue, document label names fixed (#1161)

* RAIN-4779, RAIN-4772, RAIN-4810,RAIN-4909 PDF Icon issues fixed throught the modules and file names as well and assignee name, blocker issue, document label names fixed

* RAIN-4779, RAIN-4772, RAIN-4810,RAIN-4909 PDF Icon issues fixed throughout the modules and file names as well and assignee name, blocker issue, document label names fixed

* UI [RAIN-4916 : RAIN-4805 ]: OBPS bug fixes on inbox and multiupload (#1159)

* fixed RAIN-4916 by changing status to processInstance state

* RAIN-4805 fixed the issue by removing the upload field unless code is selected

* [RAIN-4800,RAIN-4803,RAIN-4927]:OBPS CREATION AND AUDIT BUG FIXES (#1162)

* UI [RAIN-4780,RAIN-4753,RAIN-4932,RAIN-4806] : APK Common Download pdf/ image ,Notifications & BPA my applications  issue fixes done (#1153)

* RAIN-4780 : Download Receipt pdfs incase of apk

* Update api.js

* RAIN-4780 : New Ui :PDF Download issue fix incase of APK

* RAIN-4753 : Citizen ENgagement APK download file issue fix

* RAIN-4780 : Formatted code

* RAIN-4780 : Citizen engagement document issue fix

* updated utils to check

* FIxed for that doc engagemnet apk issue

* RAIN-4932 : UI : Citizen Notification issue fix

* RAIN-4806 : UI: BPA : MyApplications removed the loaded data on unmount of screen

* fixed RAIN-4763 by adding the TL mobile view (#1164)

* RAIN-4754: PT MOBILE INBOX FIX & MISC OBPS FIXES (#1165)

* RAIN-4914 fixed null vehicle error (#1166)

* fixed RAIN-4914 fixed null vehicle error

* removed debugger

* RAIN-4953 : APK Download pdf in case of open download url issue fixed

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* RAIN-4776 Fixed stakeholder documents order issue (#1167)

* RAIN-4776 Fixed stakeholder documents order issue

* RAIN-4776 Fixed stakeholder documents order issue

* RAIN-4910 by restoring to last years financial date before 1st april (#1169)

* fixed RAIN-4914 fixed null vehicle error

* removed debugger

* fixed RAIN-4910 by restoring to last years financial date before 1st april

* RAIN-4930, RAIN-4949 OBPS-UI/UX Audit - Citizen - Font size and spacing between the headers to be fixed in Application detail screenOBPS-UI/UX Audit - Citizen - Font size and spacing between the headers to be fixed in Application detail screenOBPS-UI/UX Audit - Citizen - Font size and spacing between the headers to be fixed in Application detail screen (#1171)

* [RAIN-4936,RAIN-4937,RAIN-4950]:OBPS multiple document upload bug fix and css and style changes

* RAIN-4943 : UI Billgenie APK Download group bills issue fix

* RAIN-4897: Employee Language selection screen hidden the language selection at the Header

* RAIN-4756 : Citizen Enagagement View Download alignment issue fixed

* RAIN-4756 : Citizen ENgagement ALignemnt issue fix

* RAIN-4811, RAIN-4924, RAIN-4926  "You need 5 Minutes in registration" message must be replaced in Stakeholder registration screen (#1174)

* first option will be selected by default in the OBPS create flow (#1175)

Co-authored-by: saurabh-egov <saurabh.s@egovernments.org>

* RAIN-4763 : fixed the search application mobile view (#1176)

* RAIN-4937: CSS audit testing fixes (#1178)

* RAIN-4937: CSS audit testing fixes

* RAIN-4937: CSS audit testing fixes-2

* RAIN-4930-1 Font size and spacing between the headers to be fixed in Application detail screen (#1182)

* locality not mandatory when mbno&pId is present (#1185)

Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com>

* RAIN-4950: Fine tunning of action button (#1186)

* RAIN-4950: Fine tunning of action button

* RAIN-4950: Fixed for mobile view as well

* RAIN-4763 , RAIN-4980 : UI TL FSM and css Bug fixes (#1187)

* fixed RAIN-4980 by filtering other users data

* RAIN-4763 fixed the CSS issue

* RAIN-4957, RAIN-4967, RAIN-4973, RAIN-4930, RAIN-4949 Architect Name is misaligned in OC-eDCR scrutiny detail screen (#1189)

* [RAIN-4971,RAIN-4972,RAIN-4979,RAIN-4982,RAIN-4969]:OC BPA SEND TO ARCHITECT AND SEND BACK TO CITIZEN BUG FIXES (#1190)

* RAIN-4758 : City updated validation and miscellaneous localisation fixes (#1194)

* RAIN-4942 : UI : OBPS - Fixed stakeholder regustration flow issues (#1195)

* [RAIN-4976,RAIN-4986,RAIN-4989]:Obps timeline and inbox / comaprison report fixes (#1199)

* [RAIN-4992,RAIN-4989]:Create scrutiny tenant fix and css for timeline checkpoints

* RAIN-4965 : PT ALternate No screen reload issue fix after successfully update

* RAIN-4963 : PT Alternate no should be only on open pay screen

* RAIN-4798 : APK Report search and download issue fix

* UI: OBPS Doc select category type issue fix

* RAIN-4797 :  UI : APK Report pdf xlsx file download issue fix

* RAIN-4797 :  UI : APK Report pdf xlsx file download issue fix

* RAIN-4797:  APK Report download issue fix in case of excel sheet download

* RAIN-4797 : Report downloads added a return statement at last

* UI : OBPS Doc issue fixed

* RAIN-4993 OBPS :: UAT :: Not able to Revocate the BPA application from Field Inspector login (#1201)

* RAIN-4916, RAIN-4975 UAT: OBPS: Mismatch in Application status , Architect is unable to search application based on application number in OBPS inbox screen (#1205)

* RAIN-4726, RAIN-4987:: UI fixed pdf alignment issue by adding margin & Fsm issue fix (#1210)

* v1.4.1

* RAIN-4987 inbox total now reflects the addition of pending issues only

* RAIN-4726 fixed pdf alignment issue by adding margin

* RAIN-4946 Bill Genie : Merge and download Button and its options alignment are not proper in APK. (#1212)

* [RAIN-4944,RAIN-4996,RAIN-4997,RAIN-4998]:CSS styling and function obps fixes (#1216)

* RAIN-4760, RAIN-4922  : OBPS Doc upload in sendback and removal in normal flow issues were fixed (#1218)

* docker file updated

* Revert "docker file updated"

This reverts commit c59f1ae3457084a7924bae103da4ec9101d031db.

* Docker file updated for build with different docker acc

* RAIN-4760 : OBPS Doc upload in sendback and removal in normal flow issues were fixed

* RAIN-4922 : Common dropdown issue fix and Updated CSS verison

* Update Dropdown.js

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* [RAIN-4789,RAIN-5003]:obps bug fixes relaed to clear searchand timeline (#1219)

* [RAIN-4789,RAIN-5003]:obps bug fixes relaed to clear searchand timeline

* Update package.json

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* RAIN-5001, RAIN-4975, RAIN-4999, RAIN-5002 Isuses fixed in OBPS Flow (#1220)

* RAIN-4987 by switching total count in case of dso login (#1225)

* v1.4.2

* fixed RAIN-4987 by switching total count in case of dso login

* [RAIN-4962] : Modified user search criteria (#1223)

* [RAIN-4962] : Modified user search criteria

* [RAIN-4962] : Fixed null pointer error

* [RAIN-4962] : Fixed null pointer error

* RAIN-5006, RAIN-5033, RAIN-5030, RAIN-4959, RAIN-4809, RAIN-4774 Primary owner improvement, Terms and conditions improvement and other obps bugs fixes (#1232)

* [RAIN-4989,RAIN-5032,RAIN-5037]:fix for current owner, landmark, wron… (#1234)

* [RAIN-4989,RAIN-5032,RAIN-5037]:fix for current owner, landmark, wrong pincode, fee details, localisations

* RAIN-5009 : OBPS Assign application to any particular role employee issue fixed in BPA Applications

* RAIN-4760 : Documents Re upload same file issue fixed

* RAIN-5009: UI : Common Dropdown issue fixed (#1228)

* RAIN-5009: Common Dropdown issue fixed

* FIle formatted

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* RAIN-4959 permit conditions which should come only in the approver screen (#1235)

* RAIN-5039 : financial year fixed and dual download in citizen side fixed (#1237)

* [RAIN-4776,RAIN-5049]: document details rearranged, name validation, street edit fixed (#1238)

* RAIN-4959 OCEDCR flow and OC basic details issues fixed and added loader and error messages (#1240)

* RAIN-4739 ::UI - DSS Download issue fix (#1242)

* fixed SAN-821 by replacing state (#1244)

* fixed response page loading issue by conditional statement (#1300)

* Rain 4119 pt lightweight create when creating an application (#1215)

* RAIN-4415 Create Property Common PT

(cherry picked from commit 36bd4fde38a24495cf5628a0222dde3ff550e141)

* RAIN-4119 Code review points

* Rain 4899 UI pt employee search property for linking 1 (#1217)

* RAIN-4899 Search proprty for employee CPT

(cherry picked from commit 9cddf99e10a1cd4b3b4c106bdda928dcb80fc2dd)

* RAIN-4899 Code review points

* RAIN-4899 Code review points

* Update Search.js

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* RAIN-4584-4587-4589: WS Apply screen, connection holder, timeline and… (#1138)

* RAIN-4584-4587-4589: WS Apply screen, connection holder, timeline and summary

* Integration of Doc screen and review changes

* SAN-802:Show validation message for DSO phone number on login (#1306)

Co-authored-by: ayush <ayushgupta@trisysit.com>

* SAN-784 : FSM:: FSTPO:: Entered vehicle in time is rounding off to single "0" (#1309)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* RAIN-5106 : DSS Enable the navigation from old ui overview to new UI (#1315)

* RAIN-5106 : DSS Enable the navigation from old ui overview to new UI

* formatted

* fixed fsm rating commment display issue (#1316)

* RAIN-4710 UI : National Dashboard : Map Component POC and Integrate (#1320)

* Lakshmisravani wtt egov patch 1 (#1308)

* Added new source for mgramseva

* Added condition to make user update while updating property.

* RAIN-4935 OBPS-UI/UX Audit - BPA application fail to display in Fire/Airport NOC application detail screen

* SAN-821 :: FSM - Fix for Auto Create / update api call if app left open (#1302)

* RAIN-5009 : OBPS Assign application to any particular role employee issue (#1246)

* Missing change. (#1327)

* RAIN-4929 OBPS-UI/UX Audit - All blocks of Application details must be away from the edge throughout the BPA module (#1328)

* RAIN-4929 OBPS-UI/UX Audit - All blocks of Application details must be away from the edge throughout the BPA module

* RAIN-4929 commented missing file

* RAIN-4929 commented unwated file

* SAN-826: Change in UI to show the drop-down for NUMBER_OF_TRIPS when the type is DROP_DOWN in the data received from MDMS - UI (#1332)

* Rain 3829 employee search and collect tax update invalid mobile number on collection of tax before collection (#1329)

* RAIN-3829 implementing the changes wip

* RAIN-3829 Functionality complete

* RAIN-3829 Remove console logs

* RAIN-3829 Replaced string with localisation code

* [RAIN-4940,RAIN-5047]:Action popup styles and permit date correction (#1335)

* RAIN-4739 : DSS Download issue fix in webview and movbile view is ifxed (#1336)

* RAIN-5008:: UI- bpa search application (#1339)

* RAIN-4981 : UI : Exposed all the screens for the overriding in any ca… (#1313) (#1343)

* RAIN-4981 : UI : Exposed all the screens for the overriding in any case for customisations (#1269)

Added Error Boundary component, and console error stack

* RAIN 4981 PT Module

* RAIN 4981 PT Module

* PT Module RAIN 4981-II

* PT Citizen Changes

* RAIN 4981-II mCollect

* Changes "RAIN 4981 PT Module"

* Revert "RAIN 4981-II mCollect"

This reverts commit 24d0b7e14ae6244499df9929ce01ff1d542be35f.

* Changes RAIN 4981 PT Module

* RAIN 4981 mCollect

* PT Module Citizen index RAIN 4981

* RAIN 4981 PGR Module

* RAIN 4981 TL Module

* RAIN 4981 Core Module

* RAIN 4981 NOC Module

* RAIN 4981 Obps Module

* Revert "RAIN 4981 Core Module"

This reverts commit f44fba07bfa3930970d4aad1e0e83bfeee2dc365.

* RAIN 4981 FSM Module

* RAIN 4981 Receipt Module

Co-authored-by: RamkrishnaEgovt <ramkrishna.sahoo@egovernments.org>

* RAIN 4981 Reviewed Changes

* fixed some compilation issues

* Update Module.js

* Fixed some compilation issues

* Created  pages in hrms and few other modules

* Added a Error Boundary component

Co-authored-by: RamkrishnaEgovt <ramkrishna.sahoo@egovernments.org>

Co-authored-by: RamkrishnaEgovt <ramkrishna.sahoo@egovernments.org>

* RAIN-4981 : UI Build Issue  fix (#1357)

Co-Authored-By: RamkrishnaEgovt <ramkrishna.sahoo@egovernments.org>

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>
Co-authored-by: RamkrishnaEgovt <ramkrishna.sahoo@egovernments.org>

* RAIN-4938: Configured the service and application types according to … (#1358)

* RAIN-4938: Configured the service and application types according to the roles and few miscellaneous css issues fixed

* RAIN-4938: Correction of one value in mdms

* RAIN-4948 OBPS-UI/UX Audit - Fire NOC Offline/Airport NOC Offline/Airport NOC options must not be shown on filter screen of FireNOC approver (#1360)

* RAIN-4948

* RAIN-4948v2

* RAIN-4948 OBPS-UI/UX Audit - Fire NOC Offline/Airport NOC Offline/Airport NOC options must not be shown on filter screen of FireNOC approver

* RAIN-4778 UAT: Stakeholder registration: Post approval of application, "Stakeholder Registered Successfully" screen fails to display in employee portal (#1361)

* RAIN-4778 Add response page for NOC as well (#1364)

* RAIN-4778 added conditions in common pay (#1366)

* RAIN-5186 OBPS_Success message_Permit_OC (#1370)

* RAIN-5186 OBPS_Success message_Permit_OC (#1375)

* fixed RAIN-4994 by changing input drived from multidropdown selection (#1376)

* fixed RAIN-4994 by changing input drived from multidropdown selection

* removed debugger

* RAIN-5044,5028,5048 : Mcollect dss bug fixes (#1379)

* fixed RAIN-5048 by fixing requestInforemoval block to the last conditional block

* fixed RAIN-5028 by handling case sensitive switch case block

* fixed RAIN-5044 by handling FY with respect to current date

* RAIN-5183 : DSS Mcollect some blank screen issue fixed (#1363)

* RAIN-4960, RAIN-4961 : PT Edit option for Update number in case of alternate number (#1378)

* RAIN-4960 : PT Edit option for Update number in case of alternate number

* RAIN-4961 : PT Edit option for alternate num in citizen

* RAIN-4961 :  Formatted file code

* Update updateMobile.js

* UI/UX Revamp Citizen Survey to fill the survey and submit screen static changes (Citizen side) (#987)

* added citizen side survey form

* RAIN-4208

* useSubmitResponse hook

* fix checkbox issue

* review comment changes

* RAIN-3473 : Survey Create form changes added and reverted index.js file change

* RAIN-3473 : UI : Updated the CSS Package version to 1.4.4

* SAN-817 FSM v1.1: DSO can edit pit and property usage details - UI (#1372)

* SAN-817 added new field for property type, property sub type, pit detail and added button for upload pit photo

* SAN-817 changes in upload pit photo services

* SAN-817 changes in submit function

* SAN-817 added filestoreid in pitdetails

* SAN-817 resolve error

* SAN-817 modal/index.js bug fixing

* SA-817 bug fixing in image upload

* SAN-817 bug fixing and responsive

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* RAIN-5004 OBPS filters in Inbox (#1383)

* [RAIN-4776,RAIN-4941,RAIN-5115]:application timeline enhancements and re ordering of documents in application details page (#1382)

* SAN-798: Select vehicle capacity instead of vehicle make - UI (#1373)

* SAN-798: Select vehicle capacity instead of vehicle make - UI

* SAN-798: changes for showing vehicle capacity

* SAN-798: change for showing vehicle capacity

* RAIN-5208 by fixing multiselect dropdown compatibility (#1384)

* SAN-736: Capture citizen gender on application - UI (#1377)

* SAN-736: Capture citizen gender on application - UI

* FIxed merge conflicts issue

* Removed console

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* RAIN-4948 OBPS-UI/UX Audit - Fire NOC Offline/Airport NOC Offline/Airport NOC options must not be shown on filter screen of FireNOC approver (#1387)

* SAN-688 add ULB helpline contact number in CitizenSideBar (#1388)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* RAIN-5194 : DSS Added switch for the Table and other chart if present (#1390)

* RAIN-5194 : DSS Added switch for the Table and other chart if present

* DSS : added some null check

* RAIN-5198: UI : Updated the Citizen profile update issue for name (#1381)

* RAIN-5194 : DSS added a table switch button class and updated version

* Fixed some firenoc issue related to sendback and download a  certificate

* RAIN-4945 OBPS-UI/UX Audit - For Single action, dropdown selection must not be shown during take action (#1392)

* RAIN-5004 Removed unwanted value

* RAIN-4472 : UI : Error Boundary component Updated  and added to the Employee APP

* San 795 (#1342)

* SAN-795: Change for TripCount

* SAN-795: Fix for fetching NumberOfTrip Count

* Changes as per PR (https://github.com/egovernments/DIGIT-Dev/pull/1342) review comment

Co-authored-by: Sushant Agrawal <sushant@trisysit.com>

* RAIN-4707 : DSS Map component added in national dashboard home screen… (#1395)

* RAIN-4707 : DSS Map component added in national dashboard home screen and enabled the home screen

* RAIN-4707 : DSS MAP updated the color codes

* RAIN-5198: UI : Updated the Citizen profile update issue for name

* RAIN-4732, RAIN-4923 WS :: Meter Reading Details are displayed on the summary page of sewerage modified application (#1396)

* RAIN-4984 When demand is not applicable then skip the payment stage (#1385)

* RAIN-4984 When demand is not applicable then skip the payment stage

* RAIN-4984 When demand is not applicable then skip the payment stage

* RAIN-4984 update OC workflow config for skip payment

* RAIN-4984 When demand is not applicable then skip the payment stage

* RAIN-4984 Update workflow status business service map

* RAIN-5193 Add fuzzy search for noc applnno,approvalno and sourcerefid (#1399)

* RAIN-4939, RAIN-4923 APK:OBPS:: Details overlapping on Application Details screen.

* RAIN-4252 : DSS Enabled the switch tabs for the overall dss to have revenue and services

* RAIN-5229 : DSS Table pagination issue fix

* RAIN-4252 : DSS Added a new card CSS Package version updated

* RAIN-5193 RAIN-4947:added search application noc (#1331)

* WIP added basic struture to search application noc

* SAN-826: Change in UI to show the drop-down for NUMBER_OF_TRIPS when the type is DROP_DOWN in the data received from MDMS - UI (#1332)

* WIP added basic struture to search application noc

* completedRAIN-5193 RAIN-4947

Co-authored-by: ayushgupta-eGov <94037835+ayushgupta-eGov@users.noreply.github.com>

* San 688 Change in localization key (#1402)

* SAN-688 add ULB helpline contact number in CitizenSideBar

* SAN-688 change localisation key

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>
Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>

* RAIN-4653 : DSS UI Added the switch component to support in bar charts (#1403)

* Rain 4890 Localization code change for Button (#1323)

* RAIN-4939 RAIN-4939 Bill Cancellation : APK : UI Alignment of the footer of thebill Cancellation screens are not proper.

* RAIN-5228 : DSS ULBand DDR filters options are not sorted

* RAIN-5253 : DSS Mcollect some bar chart values were not getting localisaed issue fixed

* RAIN-5224 : Bill Genie showed 2 business services in download screen

* RAIN-5247, RAIN-5223 : Billgenie Added a will expiry tooltip in download row & retry will reload

* RAIN-4981 : UI Added Error Boundary component in citizen modules

* DSS : Home screen national dashboard screen fixed (#1409)

* Rain 4898 UI pt employee light weight create property 1 (#1303)

* RAIN-4898 Create property employee common pt WIP

(cherry picked from commit 6c81c3a59dddcf4b774f371e9d400182a1dbc300)

* RAIN-4898 create property done with small static fields

(cherry picked from commit d9db04c012662f83061758c15f265ad6db428cd9)

* RAIN-4898 Removed static field

(cherry picked from commit 72a328f9372c47a2672db81ca51ea0f735446bf7)

* RAIN-4898 Remove console logs

* RAIN-4898 Add condition to create and update prop on basis of mdms config

* RAIN-4898 Add conditions for usertype

* RAIN-4898 create and update property wip

* RAIN-5125 : DSS National dashboard , navigation constant updated (#1414)

* RAIN-5125 : DSS New ui card added for state and national dashboards (#1416)

* Changes for SAN-822, to support citizen gender while creating applica… (#1404)

* Changes for SAN-822, to support citizen gender while creating application

* Code changes as per review comment PR #1404

Co-authored-by: Sushant Agrawal <sushant@trisysit.com>

* SAN-823: changes to handle gender of DSO (#1407)

Co-authored-by: Sushant Agrawal <sushant@trisysit.com>

* RAIN-4994:Multiselect integration in citizen side scrutiny details (#1418)

* Central instance changes copy merge (#1410)

* kafka topics updated with state tenantid

* tracer version udated to 2.1.0

* otp made only for "\in"\ tenant

* test removed

* bug fix

* tracer updated for all municipal services to 2.1.0

* Update migrate.sh

* removed repo for conflict

* Update migrate.sh

* Update migrate.sh

* Update migrate.sh

* Update migrate.sh

* schemaname

* Update migrate.sh

* Update migrate.sh

* Update migrate.sh

* Update migrate.sh

* Update migrate.sh

* Update migrate.sh

* Update migrate.sh

* Update migrate.sh

* Update migrate.sh

* Update migrate.sh

* Update migrate.sh

* tracer version upgraded

* tracer upgraded

* Update pom.xml

* Central billing coll patch (#115)

* billing collection schema nased queries update

* pom update, merger from bill coll query update

* tenant replace fix

* tenat replace flow test and fix

* [RAIN-3391] Multiple schema migration: changes in hrms, billing and collection services migration script

* Update pom.xml

* Update pom.xml

* removed unwanted migrations

* Delete business-services/billing-service/src/main/resources/db/migration/seed directory

* Update Dockerfile

* Update pom.xml

* tenantid fix in kafka topic

* Update CODEOWNERS

* Central property schema (#156)

* schema replacer added and migration service removed

* tenantid reverted to criteria

* Revert "schema replacer added and migration service removed"

This reverts commit 69a6bdce28a6bc489c4a2994908a46068cdaebab.

* schema replacer added for property

* Update PropertyRepository.java (#157)

* central search upgrade for property (#220)

* RAIN-3724: made migration bean optional to remove statelevel tenantId (#221)

* Update repo id (#223)

* Property query update (#239)

* state level tenant change

* query refactoring

* Central update (#240)

* central search upgrade for property

* state level tenant change

* table name fix in query (#241)

* Update repo id (#244)

* Kavi patch 14 sep (#246)

* table name fix in query

* and clause bug fix

* kafka topic update for central env

* RAIN-3742: correction to POM (#249)

* RAIN-3742: updated billing POM (#250)

* Update main.go (#256)

* Update main.go (#257)

* RAIN-3724: updated kafka producer for billing slab (#258)

* Rain 3742 (#259)

* RAIN-3724: updated kafka producer for billing slab

* RAIN-3742: correction to topic name

Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com>

* RAIN-3799: made changes for single instance (#280)

* RAIN-3799: updated producer in sms and events (#281)

* RAIN-3799: updated migration shell script (#282)

* RAIN-3799: added tenantId in update (#284)

* added schema replacer to assmt query (#285)

* tl single instace update (#298)

* tl single instace update

* query schemareplace

* RAIN-3671: updated POM (#307)

* search bug fix (#320)

* RAIN-3801 water service single instance changes (#313)

* RAIN-3801 water service single instance changes

* RAIN-3801 Removed state level tenantid variable

* RAIN-3836: updated the tenantId in citizen search flow (#333)

* RAIN-3905: added replace schema in bill status update (#335)

* [RAIN-3391] Central instance multiple schema changes in hrms service (#151)

* [RAIN-3391] Central instance multiple schema changes in hrms service

* [RAIN-3391] Added logic for db operations to be done on default schema in case central instance level tenant id is passed

* [RAIN-3614] Removed unnecessary assignment of tenantID to null in hrms service

* [RAIN-3614] HRMS changes for central instance bug

* [RAIN-3666] Added customized sms topic support for hrms

* RAIN-3801 sewerage service single instance changes (#339)

* [RAIN-3828] added multiple schema changes in workflow service (#286)

* [RAIN-3828] added multiple schema changes in workflow service

* [RAIN-3828] Added validations to ensure that tenantId is passed mandatorily in WF calls

* [RAIN-3828] Updated migration shell script for WF

* Wf changes (#371)

* RAIN-3393: added fallback in workflow

* RAIN-3392: fallback changes for bulk search

* RAIN-3393: removed MDMS dependency

* Updated tracer version in wf

Co-authored-by: talele08 <talele.aniket@gmail.com>

* state level search for bill & coll (#374)

* dynamic topics for bill update added (#383)

* startup bug fix (#401)

* RAIN-3802 Made changes for single instance in fire noc service and calculator (#404)

* RAIN-4005: Remove invalid validation (#416)

* Update BillingServiceConsumer.java (#417)

* Update BillingServiceConsumer.java

* revert of kafka topic changes

* Rain 4005 (#418)

* RAIN-4005: removed tenantId enrichment in my tl search

* RAIN-4005: overloaded repository methods when tenantId is not available

* mdc setting in consumer (#421)

* mdc tenantid fix (#422)

* payment aduti backupdate fix (#424)

* payment aduti backupdate fix

* failure update fix

* Added tenantId in MDC in kafka consumer (#430)

* Rain 4005 (#431)

* Added tenantId in MDC in kafka consumer

* RAIN-4005: added tenantId in MDC in payment notification flow

* added tenantId in MDC in kafka consumers of PT and PGR (#432)

* Enhanced pgr in app notifications for rate and reopen buttons (#435)

* Updated producer to push on state topic (#439)

* Updated producer to push on state topic

* data posted in multiple topics

Co-authored-by: kaviyarasan1993 <kaviyarasanit@gmail.com>

* single instance changes for pg-service (#447)

* Dss ingest error handling (#449)

* Added error stack trace in ingest

* changes dor central instance

* Rain 3991 (#452)

* RAIN-3991 Updated header value

* RAIN-3991 Updated MDMS host

* made kafka topic names configurable (#454)

* added schema placeholder at missing places (#457)

* report pom udated (#458)

* Ingest cleanup (#460)

* removed duplicate variables

* dss ingest cleanup

* updated POM version (#463)

* Rain 4052 (#477)

* RAIN-4052 corrected tenantid

* RAIN-4052 corrected tenantid and added tenantId in MDC in kafka consumers

* RAIN-4052 Set tenantid for update call

* RAIN-4052 Updated query

* RAIN-4052 set is.environment.central.instance as true

* RAIN-3693 Fixed firenoc create,update and s…
  • Loading branch information
Show file tree
Hide file tree
Showing 233 changed files with 5,697 additions and 1,161 deletions.
8 changes: 8 additions & 0 deletions build/build-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,14 @@ config:
- work-dir: "core-services/egov-survey-services/src/main/resources/db"
image-name: "egov-survey-services-db"

- name: "builds/digit-dev/core-services/service-request"
build:
- work-dir: "core-services/service-request"
image-name: "service-request"
dockerfile: "build/maven/Dockerfile"
- work-dir: "core-services/service-request/src/main/resources/db"
image-name: "service-request-db"


- name: "builds/digit-dev/core-services/report"
build:
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion core-services/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ DIGIT Core Platform consists of the foundational microservices for authenticatio

#### DIGIT is released under MIT License


This file was deleted.

8 changes: 8 additions & 0 deletions core-services/service-request/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@


# Changelog
All notable changes to this module will be documented in this file.

## 1.0.0_beta - 2020-04-13

- Base version
18 changes: 18 additions & 0 deletions core-services/service-request/LOCALSETUP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Local Setup

To setup the service-request in your local system, clone the [Muncipal Service repository](https://github.com/egovernments/DIGIT-Dev).

## Dependencies

### Infra Dependency

- [x] Postgres DB
- [ ] Redis
- [ ] Elasticsearch
- [x] Kafka
- [x] Consumer
- [x] Producer

## Running Locally

To run the service-request in local system, you need to change dB connection details as per your local setup of postgres.
18 changes: 18 additions & 0 deletions core-services/service-request/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Swagger generated server

Spring Boot Server


## Overview
This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.
By using the [OpenAPI-Spec](https://github.com/swagger-api/swagger-core), you can easily generate a server stub.
This is an example of building a swagger-enabled server in Java using the SpringBoot framework.

The underlying library integrating swagger to SpringBoot is [springfox](https://github.com/springfox/springfox)

Start your server as an simple java application

You can view the api documentation in swagger-ui by pointing to
http://localhost:8080/

Change default port value in application.properties
125 changes: 125 additions & 0 deletions core-services/service-request/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.egov</groupId>
<artifactId>service-request</artifactId>
<packaging>jar</packaging>
<name>service-request</name>
<version>1.0.0_beta-SNAPSHOT</version>
<properties>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.6.RELEASE</version>
</parent>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.2.jre7</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>1.5.18</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.2.8</version>
</dependency>

<!-- Egov dependencies -->
<dependency>
<groupId>org.egov.services</groupId>
<artifactId>tracer</artifactId>
<version>2.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.egov.services</groupId>
<artifactId>digit-models</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.egov</groupId>
<artifactId>mdms-client</artifactId>
<version>0.0.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<!-- Bean Validation API support -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
</dependencies>
<repositories>
<repository>
<id>repo.egovernments.org</id>
<name>eGov ERP Releases Repository</name>
<url>https://nexus-repo.egovernments.org/nexus/content/repositories/releases/</url>
</repository>
<repository>
<id>repo.egovernments.org.snapshots</id>
<name>eGov ERP Releases Repository</name>
<url>https://nexus-repo.egovernments.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>repo.egovernments.org.public</id>
<name>eGov Public Repository Group</name>
<url>https://nexus-repo.egovernments.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>repo.digit.org</id>
<name>eGov DIGIT Releases Repository</name>
<url>https://nexus-repo.digit.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package digit;


import org.egov.tracer.config.TracerConfiguration;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;

@Import({ TracerConfiguration.class })
@SpringBootApplication
public class ServiceRequestApplication {

public static void main(String[] args) {
SpringApplication.run(ServiceRequestApplication.class, args);
}

}
Loading

0 comments on commit 6faf040

Please sign in to comment.