Skip to content

Commit ad4ce9b

Browse files
jagankumar-egovRamkrishna-egovburhanj-eGov
authored
RAIN-6759, RAIN-6744 ,RAIN-6736 : PT Mandatory mark, Update Number validation & Dss Share issues fixed (#2444)
* RAIN-6702, 6703 Download Share responsive in Dashboards and Download issue fix in APK * RAIN-6759, RAIN-6744 ,RAIN-6736 : PT Mandatory mark, Update no popup , Number validation & Dss Share issues fixed (#2442) * RAIN-6759 : PT Mobile number validation issue fixed * RAIN-6744 , RAIN-6736:: PT Updated the mandatory marks & Popup issue fixed(#2439) * fixing mobile No popup and adding mandatory marks * fixing property creation failed * RAIN-6736:: PT Updated the mandatory marks Co-authored-by: Jagankumar <[email protected]> * Updated libraries package.json * Updated other package versions * RAIN-6703:: DSS UI Download issue in APK fix, Share and download responsive(#2436) * Download of File in Mobile and Responsive Share and Download option in dashboard fix * RAIN-6703 Download issue in APK fix, Share and download responsive * Share fix * Check mSeva App * Console Logs removed * device detect package removed * Updated dss and library versions * Update package.json Co-authored-by: burhanj-eGov <[email protected]> Co-authored-by: Ramkrishna-egov <[email protected]> * RAIN-6316 : Frontend Readme.md file added for all react apps (#2438) Co-authored-by: RamkrishnaEgovt <[email protected]> Co-authored-by: burhanj-eGov <[email protected]> Co-authored-by: Ramkrishna-egov <[email protected]>
1 parent 510f0bd commit ad4ce9b

File tree

41 files changed

+879
-503
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+879
-503
lines changed

frontend/README.md

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# Starting with Digit-UI Internal Development (Engineering Team) - MICRO-UI
2+
cd into /micro-ui/web/micro-ui-internals
3+
In the project directory, you can run:
4+
### `yarn install`
5+
### `yarn run start:dev` or `yarn run sprint`
6+
7+
Runs the app in the development mode.\
8+
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
9+
10+
# Starting with Digit-UI App (Impelmentation Teams) - MICRO-UI
11+
cd into /micro-ui/web
12+
In the project directory, you can run:
13+
### `yarn install`
14+
### `yarn run start`
15+
16+
Runs the app in the development mode.\
17+
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
18+
19+
# Starting with Citizen App (Old UI) - MONO-UI
20+
cd into /mono-ui/web/rainmaker
21+
In the project directory, you can run:
22+
### `yarn install`
23+
### `yarn run go`
24+
### `yarn run dev:citizen`
25+
26+
Runs the app in the development mode.\
27+
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
28+
29+
# Starting with Employee App (Old UI) - MONO-UI
30+
cd into /mono-ui/web/rainmaker
31+
In the project directory, you can run:
32+
### `yarn install`
33+
### `yarn run go`
34+
### `yarn run dev:employee`
35+
36+
Runs the app in the development mode.\
37+
Open [http://localhost:3006](http://localhost:3006) to view it in the browser.
38+
39+
40+
# Starting with Dashboard App (Old UI) - MONO-UI
41+
cd into /mono-ui/web/dss-dashboard
42+
In the project directory, you can run:
43+
### `yarn install`
44+
### `yarn run start`
45+
46+
Runs the app in the development mode.\
47+
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
48+
49+
50+
# Dashboard App
51+
Contains Dashboard for all modules:
52+
53+
# MONO UI App
54+
Contains Citizen & Employee App for the modules like
55+
1. Property Tax
56+
2. Complaints
57+
3. Tradelicence
58+
4. NOC
59+
5. FireNOC
60+
6. Water & Sewerage
61+
7. MISC Collections
62+
8. Bill & Receipts
63+
9. HRMS
64+
10. OBPS
65+
66+
# MICRO UI App
67+
Contains Citizen & Employee App for the modules like
68+
1. Property Tax
69+
2. Complaints
70+
3. Tradelicence
71+
4. NOC
72+
5. FSM
73+
6. HRMS
74+
7. OBOS
75+

frontend/micro-ui/web/micro-ui-internals/packages/css/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@egovernments/digit-ui-css",
3-
"version": "1.5.0-beta.2",
3+
"version": "1.5.0-beta.3",
44
"license": "MIT",
55
"main": "dist/index.css",
66
"engines": {

frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/citizen/updatePropertyNumber.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.updatenumber-warper-citizen{
2+
min-height: 95vh;
3+
height: unset;
4+
}
15
.updatePropertyNumber {
26
.pt-update-no-popup-wrapper {
37
@apply m-md;
@@ -19,6 +23,10 @@
1923
}
2024

2125
@screen dt {
26+
.updatenumber-warper-citizen{
27+
min-height: 100vh;
28+
height: unset;
29+
}
2230
.updatePropertyNumber {
2331
.h1 {
2432
@apply m-md;

frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@egovernments/digit-ui-libraries",
3-
"version": "1.5.0-beta.2",
3+
"version": "1.5.0-beta.4",
44
"main": "dist/index.js",
55
"module": "dist/index.modern.js",
66
"source": "src/index.js",

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Download.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import jsPDF from "jspdf";
44
import XLSX from "xlsx";
55
import domtoimage from "dom-to-image";
66

7-
87
const changeClasses=(class1,class2)=>{
98
var elements = document.getElementsByClassName(class1)
109
Array.prototype.map.call(elements, function(testElement){
@@ -60,10 +59,10 @@ const Download = {
6059
},
6160

6261
PDF: (node, fileName, share, resolve = null) => {
63-
64-
65-
6662
const saveAs = (uri, filename) => {
63+
if(window.mSewaApp && window.mSewaApp.isMsewaApp()){
64+
window.mSewaApp.downloadBase64File(uri, filename);
65+
}
6766
const link = document.createElement("a");
6867

6968
if (typeof link.download === "string") {
@@ -165,6 +164,9 @@ const Download = {
165164

166165
IndividualChartImage: (node, fileName, share, resolve = null) => {
167166
const saveAs = (uri, filename) => {
167+
if(window.mSewaApp && window.mSewaApp.isMsewaApp()){
168+
window.mSewaApp.downloadBase64File(uri, filename);
169+
}
168170
const link = document.createElement("a");
169171

170172
if (typeof link.download === "string") {

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Localization/service.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ export const LocalizationService = {
7979
const allModules = LocalizationStore.getAllList();
8080
const uniqueModules = allModules.filter((module) => !modules.includes(module));
8181
LocalizationService.getLocale({ modules: uniqueModules, locale, tenantId });
82+
localStorage.setItem("Employee.locale", locale);
83+
localStorage.setItem("Citizen.locale", locale);
8284
Digit.SessionStorage.set("locale", locale);
8385
i18next.changeLanguage(locale);
8486
},

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/ShareFiles.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ const ShareFiles = {
88
case "mail":
99
return window.open(`mailto:?body=${shortUrl}`, "_blank");
1010
case "whatsapp":
11+
if(window.mSewaApp && window.mSewaApp.isMsewaApp())
12+
return window.open(`https://wa.me/send?text=${shortUrl}`, "_blank");
13+
else
1114
return window.open(`https://web.whatsapp.com/send?text=${shortUrl}`, "_blank");
1215
default:
1316
return window.open(shortUrl, "_blank");

frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"prepublish": "yarn build"
1515
},
1616
"dependencies": {
17-
"@egovernments/digit-ui-libraries": "1.5.0-beta.2",
17+
"@egovernments/digit-ui-libraries": "1.5.0-beta.4",
1818
"@egovernments/digit-ui-react-components": "1.5.0-beta.2",
1919
"react": "17.0.2",
2020
"react-dom": "17.0.2",

frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@egovernments/digit-ui-module-commonpt",
3-
"version": "1.5.0-beta.2",
3+
"version": "1.5.0-beta.3",
44
"license": "MIT",
55
"main": "dist/index.js",
66
"module": "dist/index.modern.js",
@@ -18,7 +18,7 @@
1818
"react-router-dom": "5.3.0"
1919
},
2020
"dependencies": {
21-
"@egovernments/digit-ui-libraries": "1.5.0-beta.2",
21+
"@egovernments/digit-ui-libraries": "1.5.0-beta.4",
2222
"@egovernments/digit-ui-react-components": "1.5.0-beta.2",
2323
"lodash.merge": "^4.6.2",
2424
"react": "17.0.2",

frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/src/pages/citizen/SearchProperty/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export const config = [
1010
label: "Owner Mobile Number",
1111
type: "mobileNumber",
1212
name: "mobileNumber",
13-
validation:{pattern:{ value: /[789][0-9]{9}/,
13+
validation:{pattern:{ value: /[6789][0-9]{9}/,
1414
message: "CORE_COMMON_MOBILE_ERROR",}},
1515
error: "CORE_COMMON_MOBILE_ERROR",
1616
},

0 commit comments

Comments
 (0)