Develop

business-services/billing-service/src/main/java/org/egov/demand/model/AggregatedDemandDetailResponse.java

@@ -29,10 +29,14 @@ public class AggregatedDemandDetailResponse {
 
     private BigDecimal currentmonthTotalDue;
 
+    private BigDecimal currentmonthRoundOff;
+
     private BigDecimal totalAreas;
 
     private BigDecimal totalAreasWithPenalty;
 
+    private BigDecimal totalAreasRoundOff;
+
     private BigDecimal netdue;
 
     private BigDecimal netDueWithPenalty;

business-services/billing-service/src/main/java/org/egov/demand/service/DemandService.java

@@ -720,19 +720,29 @@ public int compare(Demand d1, Demand d2) {
 		BigDecimal netdue = BigDecimal.ZERO;
 		BigDecimal netDueWithPenalty = BigDecimal.ZERO;
 		BigDecimal totalApplicablePenalty =BigDecimal.ZERO;
+		BigDecimal currentmonthRoundOff=BigDecimal.ZERO;
+		BigDecimal totalAreasRoundOff=BigDecimal.ZERO;
 
 		currentmonthBill = currentMonthDemandDetailList.stream()
 				.filter(dd -> dd.getTaxHeadMasterCode().equals("10101")) // filter by taxHeadCode
 				.map(dd -> dd.getTaxAmount().subtract(dd.getCollectionAmount())) // map to the balance between taxAmount and collectedAmount
 				.reduce(BigDecimal.ZERO, BigDecimal::add);
+
+		currentmonthRoundOff = currentMonthDemandDetailList.stream()
+				.filter(dd -> dd.getTaxHeadMasterCode().equals("WS_Round_Off")) // filter by taxHeadCode
+				.map(dd -> dd.getTaxAmount().subtract(dd.getCollectionAmount())) // map to the balance between taxAmount and collectedAmount
+				.reduce(BigDecimal.ZERO, BigDecimal::add);
+		log.info("currentmonthRoundOff::::"+currentmonthRoundOff);
+
 		log.info("currentMonthDemandDetailList::::"+currentMonthDemandDetailList);
 		currentMonthPenalty = currentMonthDemandDetailList.stream()
 				.filter(dd -> dd.getTaxHeadMasterCode().equals("WS_TIME_PENALTY")) // filter by taxHeadCode
 				.map(dd -> dd.getTaxAmount().subtract(dd.getCollectionAmount())) // map to the balance between taxAmount and collectedAmount
 				.reduce(BigDecimal.ZERO, BigDecimal::add);
 		log.info("currentMonthDemandDetailListafter::::"+currentMonthDemandDetailList);
 		log.info("currentMonthPenalty" + currentMonthPenalty);
-		currentmonthTotalDue = currentmonthBill.add(currentMonthPenalty);
+		currentmonthTotalDue = currentmonthBill.add(currentMonthPenalty).add(currentmonthRoundOff);
+		log.info("currentmonthTotalDue" + currentmonthTotalDue);
 		if(currentMonthPenalty.equals(BigDecimal.ZERO)) {
 			List<MasterDetail> masterDetails = new ArrayList<>();
 			MasterDetail masterDetail = new MasterDetail("Penalty", "[?(@)]");
@@ -759,7 +769,13 @@ public int compare(Demand d1, Demand d2) {
 
 
 		//Tax headcode for WScharges,legacypenalty,legacyarea
-		List<String> taxHeadCodesToFilterWithoutPenalty = Arrays.asList("10102", "10201", "10101");
+		List<String> taxHeadCodesToFilterWithoutPenalty = Arrays.asList("10102", "10201", "10101","WS_Round_Off");
+
+		// Initialize the variable for the sum of taxAmount - collectedAmount specifically for WS_Round_Off
+		totalAreasRoundOff = remainingMonthDemandDetailList.stream()
+				.filter(dd -> "WS_Round_Off".equals(dd.getTaxHeadMasterCode())) // Filter specifically for WS_Round_Off
+				.map(dd -> dd.getTaxAmount().subtract(dd.getCollectionAmount())) // Calculate taxAmount - collectedAmount
+				.reduce(BigDecimal.ZERO, BigDecimal::add); // Sum all results
 
 		// Initialize the variable for the sum of taxAmount - collectedAmount for the filtered tax head codes
 		totalAreas = remainingMonthDemandDetailList.stream()
@@ -799,7 +815,7 @@ public int compare(Demand d1, Demand d2) {
 		if(remainingAdvance !=BigDecimal.ZERO && currentmonthBill !=BigDecimal.ZERO && advanceAdjusted.equals(BigDecimal.ZERO)) {
 		}
 
-		netdue = currentmonthBill.add(totalAreas).add(remainingAdvance);
+		netdue = currentmonthBill.add(totalAreas).add(remainingAdvance).add(currentmonthRoundOff);
 		netDueWithPenalty = currentmonthTotalDue.add(totalAreasWithPenalty).add(remainingAdvance);
 
 		//BigDecimal currentMonthBill
@@ -808,8 +824,10 @@ public int compare(Demand d1, Demand d2) {
 				.currentmonthBill(currentmonthBill)
 				.currentMonthPenalty(currentMonthPenalty)
 				.currentmonthTotalDue(currentmonthTotalDue)
+				.currentmonthRoundOff(currentmonthRoundOff)
 				.totalAreas(totalAreas)
 				.totalAreasWithPenalty(totalAreasWithPenalty)
+				.totalAreasRoundOff(totalAreasRoundOff)
 				.netdue(netdue)
 				.netDueWithPenalty(netDueWithPenalty)
 				.advanceAdjusted(advanceAdjusted)

frontend/mgramseva/lib/components/house_connection_and_bill/new_consumer_bill.dart

@@ -243,10 +243,15 @@ class NewConsumerBillState extends State<NewConsumerBill> {
                                           houseHoldProvider.isfirstdemand)
                                         getLabelText(
                                             i18.common.CORE_ADVANCE_ADJUSTED,
+
+                                            double.parse(CommonProvider
+                                                        .getAdvanceAdjustedAmount(
+                                                            widget
+                                                                .demandList)) == 0 ? "₹ ${houseHoldProvider.aggDemandItems?.remainingAdvance}" :
                                             double.parse(CommonProvider
                                                         .getAdvanceAdjustedAmount(
                                                             widget
-                                                                .demandList)) <=
+                                                                .demandList)) <
                                                     0
                                                 ? "₹ ${double.parse(CommonProvider.getAdvanceAdjustedAmount(widget.demandList))}"
                                                 : '- ₹${double.parse(CommonProvider.getAdvanceAdjustedAmount(widget.demandList))}',

frontend/mgramseva/lib/model/demand/demand_list.dart

@@ -143,6 +143,8 @@ class AggragateDemandDetails {
   double? currentMonthPenalty;
   @JsonKey(name: "currentmonthTotalDue")
   double? currentmonthTotalDue;
+  @JsonKey(name: "currentmonthRoundOff")
+  double? currentmonthRoundOff;
   @JsonKey(name: "totalAreas")
   double? totalAreas;
   @JsonKey(name: "totalAreasWithPenalty")

frontend/micro-ui/web/.babelrc

@@ -1,5 +1,9 @@
 {
-    "presets": [
-      "@babel/preset-env","@babel/preset-react"
-    ]
-  }
+  "presets": [
+    "@babel/preset-env",
+    "@babel/preset-react"
+  ],
+  "plugins": [
+    "@babel/plugin-proposal-optional-chaining"
+  ]
+}

frontend/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js

@@ -8,11 +8,19 @@ var Digit = window.Digit || {};
 
 
 function anonymizeHalfString(input) {
-  // Calculate the midpoint of the string
-  const midpoint = Math.ceil(input.length / 2);
-
-  // Replace the first 50% of the string with asterisks
-  const anonymized = "*".repeat(midpoint) + input.substring(midpoint);
+  // Initialize an empty string to store the anonymized output
+  let anonymized = "";
+  // Loop through each character in the input string
+  for (let i = 0; i < input.length; i++) {
+    // Check if the index (i) is even (0, 2, 4, ...)
+    if (i % 2 === 0) {
+      // Append the original character (keep it)
+      anonymized += input[i];
+    } else {
+      // Append an asterisk to mask the alternate character
+      anonymized += "*";
+    }
+  }
 
   return anonymized;
 }

frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss

@@ -350,6 +350,47 @@
   }
 }
 
+.dropdown-user .dropbtn{
+    color: white;
+    font-size: 1rem;
+    margin: 10px;
+    background-color: #efefef00;
+}
+.dropdown-user {
+  position: relative; /* Make the dropdown relative to its container */
+  display: inline-block;
+}
+
+.dropdown-user-overlay {
+  position: absolute; /* Position the overlay absolutely relative to the dropdown */
+  top: 100%; /* Position the overlay below the button */
+  left: 0; /* Align the overlay to the left of the button */
+  background-color: #f1f1f1; /* Set background color */
+  min-width: 160px; /* Set minimum width */
+  box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); /* Add shadow */
+  z-index: 1; /* Set z-index to display on top of other elements */
+  display: none; /* Hide by default */
+}
+
+.dropdown-user-content {
+  padding: 0; /* Remove default padding from ul */
+  list-style: none; /* Remove default list style */
+}
+
+.dropdown-user-content li {
+  border-bottom: solid 1px !important;
+  border-color: black !important;
+  padding: 12px 12px; /* Add padding to list items */
+}
+.dropdown-user-link {
+  text-decoration: none !important; /* Remove underline from links inside list items */
+}
+
+.dropdown-user:hover .dropdown-user-overlay {
+  display: block; /* Show overlay on hover */
+}
+
+
 .RightMostTopBarOptions {
   @apply flex;
   .EventNotificationWrapper {
@@ -369,6 +410,9 @@
       fill: theme(colors.white);
     }
   }
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
 @media (min-width: 640px) {
@@ -477,8 +521,24 @@
       .hamburger-span {
         display: none;
       }
+      .city{
+        height: 48px !important;
+        width: 48px !important;
+        padding: 0px !important;
+      }
+
     }
+
   }
+
+  .hambuger-back-wrapper .city{
+    object-fit: scale-down !important;
+    border-radius: 5px !important;
+    padding: 1px 15px !important;
+  }
+
+
+
 }
 
 @screen dt {

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

@@ -63,6 +63,21 @@ const initRequestBody = (tenantId) => ({
     ],
   },
 });
+const initRequestBodyWithOutTenent = (tenantId) => ({
+  MdmsCriteria: {
+    tenantId,
+    moduleDetails: [
+      {
+        moduleName: "common-masters",
+        masterDetails: [{ name: "Department" }, { name: "Designation" }, { name: "StateInfo" }, { name: "wfSlaConfig" }, { name: "uiHomePage" }],
+      },
+      {
+        moduleName: "DIGIT-UI",
+        masterDetails: [{ name: "ApiCachingSettings" }],
+      },
+    ],
+  },
+});
 
 const getCriteria = (tenantId, moduleDetails) => {
   return {
@@ -1478,6 +1493,14 @@ export const MdmsService = {
       useCache: true,
       params: { tenantId: stateCode },
     }),
+  initWithOutTenent: (stateCode) =>
+    ServiceRequest({
+      serviceName: "mdmsInit",
+      url: Urls.MDMS,
+      data: initRequestBodyWithOutTenent(stateCode),
+      useCache: true,
+      params: { tenantId: stateCode },
+    }),
   call: (tenantId, details) => {
     return new Promise((resolve, reject) =>
       debouncedCall(

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

@@ -55,9 +55,10 @@ export const StoreService = {
     return await Promise.all(allBoundries);
   },
   digitInitData: async (stateCode, enabledModules) => {
-    const { MdmsRes } = await MdmsService.init(stateCode);
+    const { MdmsRes } =   await MdmsService.init(stateCode);
     const stateInfo = MdmsRes["common-masters"]?.StateInfo?.[0] || {};
     const uiHomePage = MdmsRes["common-masters"]?.uiHomePage?.[0] || {};
+
     const localities = {};
     const revenue_localities = {};
     const initData = {
@@ -80,22 +81,12 @@ export const StoreService = {
 
     initData.selectedLanguage =
       Digit.SessionStorage.get("locale") || initData?.languages[2] ? initData?.languages[2]?.value : initData?.languages[1]?.value;
-
     ApiCacheService.saveSetting(MdmsRes["DIGIT-UI"]?.ApiCachingSettings);
-
-    const moduleTenants = initData?.modules
-      .map((module) => module.tenants)
-      .flat()
-      .reduce((unique, ele) => (unique.find((item) => item.code === ele.code) ? unique : [...unique, ele]), []);
-    initData.tenants = MdmsRes?.tenant?.tenants
-      // ?.filter((x) => x.pgrEnabled)
+      initData.tenants = MdmsRes?.tenant?.tenants
       .map((tenant) => ({
         i18nKey: `TENANT_TENANTS_${tenant.code.replace(".", "_").toUpperCase()}`,
         ...tenant,
       }));
-    // .filter((item) => !!moduleTenants.find((mt) => mt.code === item.code))
-    // .map((tenant) => ({ i18nKey: `TENANT_TENANTS_${tenant.code.replace(".", "_").toUpperCase()}`, ...tenant }));
-
     await LocalizationService.getLocale({
       modules: [`rainmaker-common`],
       locale: initData.selectedLanguage,