Merge pull request #1126 from nehaniua/Dev-2.0

Door, windows added in report, lift changes, non habitational doors, …

edcr/service/egov/egov-commons/src/main/java/org/egov/common/entity/edcr/Door.java

@@ -54,34 +54,86 @@ public class Door {
 
 private static final long serialVersionUID = 105L;
 
-    private String name;
-
-    private List<BigDecimal> widths = new ArrayList<>();
-
-    private int colorCode;
+private String name;
+
+private List<BigDecimal> widths = new ArrayList<>();
+
+private BigDecimal doorWidth;
+
+private BigDecimal doorHeight;
+
+private List<BigDecimal> nonHabitationDoorWidths = new ArrayList<>();
+
+private BigDecimal  nonHabitationDoorWidth;
+
+private BigDecimal  nonHabitationDoorHeight;
+
+private int colorCode;
+
+public String getName() {
+	return name;
+}
+
+public void setName(String name) {
+	this.name = name;
+}
+
+public List<BigDecimal> getNonHabitationDoorWidths() {
+	return nonHabitationDoorWidths;
+}
+
+public void setNonHabitationDoorWidths(List<BigDecimal> nonHabitationDoorWidths) {
+	this.nonHabitationDoorWidths = nonHabitationDoorWidths;
+}
+
+public List<BigDecimal> getWidths() {
+	return widths;
+}
+
+public void setWidths(List<BigDecimal> widths) {
+	this.widths = widths;
+}
+
+
+public int getColorCode() {
+	return colorCode;
+}
+
+public void setColorCode(int colorCode) {
+	this.colorCode = colorCode;
+}
+
+public BigDecimal getDoorWidth() {
+	return doorWidth;
+}
 
-	public String getName() {
-		return name;
-	}
+public void setDoorWidth(BigDecimal doorWidth) {
+	this.doorWidth = doorWidth;
+}
 
-	public void setName(String name) {
-		this.name = name;
-	}
+public BigDecimal getDoorHeight() {
+	return doorHeight;
+}
 
-	public List<BigDecimal> getWidths() {
-		return widths;
-	}
+public void setDoorHeight(BigDecimal doorHeight) {
+	this.doorHeight = doorHeight;
+}
 
-	public void setWidths(List<BigDecimal> widths) {
-		this.widths = widths;
-	}
+public BigDecimal getNonHabitationDoorWidth() {
+	return nonHabitationDoorWidth;
+}
 
-	public int getColorCode() {
-		return colorCode;
-	}
+public void setNonHabitationDoorWidth(BigDecimal nonHabitationDoorWidth) {
+	this.nonHabitationDoorWidth = nonHabitationDoorWidth;
+}
 
-	public void setColorCode(int colorCode) {
-		this.colorCode = colorCode;
-	}
+public BigDecimal getNonHabitationDoorHeight() {
+	return nonHabitationDoorHeight;
+}
 
+public void setNonHabitationDoorHeight(BigDecimal nonHabitationDoorHeight) {
+	this.nonHabitationDoorHeight = nonHabitationDoorHeight;
 }
+
+
+}

edcr/service/egov/egov-commons/src/main/java/org/egov/common/entity/edcr/Floor.java

@@ -84,6 +84,12 @@ public class Floor extends Measurement {
     private List<Room> regularRooms = new ArrayList<>();
     private List<Room> habitationRooms = new ArrayList<>();
     private List<Room> storeRooms = new ArrayList<>();
+    // Doors for version 1.1.1
+    private List<Door> doors = new ArrayList<>();
+    private List<Door> nonaHabitationalDoors = new ArrayList<>();
+
+    private List<Window> windows = new ArrayList<>();
+
     private Room kitchen;
     private Room bathRoom;
     private Room waterClosets;
@@ -106,8 +112,7 @@ public class Floor extends Measurement {
     private List<Measurement> constructedAreas = new ArrayList<>();
 
     private List<GlassFacadeOpening> glassFacadeOpenings = new ArrayList<>();
-    // Doors for version 1.1.1
-    private List<Door> doors = new ArrayList<>();
+
 
     // From 2.0.0 version
     private List<BigDecimal> heightFromFloorToBottomOfBeam;
@@ -174,6 +179,42 @@ public void addLifts(Lift lift) {
     public void addDaLifts(Lift daLift) {
         this.daLifts.add(daLift);
     }
+
+    public List<Door> getNonaHabitationalDoors() {
+        return nonaHabitationalDoors;
+    }
+
+    public void setNonaHabitationalDoors(List<Door> nonaHabitationalDoors) {
+        this.nonaHabitationalDoors = nonaHabitationalDoors;
+    }
+
+    public void addNonaHabitationalDoors(Door nonaHabitationalDoors) {
+        this.nonaHabitationalDoors.add(nonaHabitationalDoors);
+    }
+
+    public List<Door> getDoors() {
+        return doors;
+    }
+
+    public void setDoors(List<Door> doors) {
+        this.doors = doors;
+    }
+
+    public void addDoor(Door door) {
+        this.doors.add(door);
+    }
+
+    public List<Window> getWindows() {
+		return windows;
+	}
+
+	public void setWindows(List<Window> windows) {
+		this.windows = windows;
+	}
+
+	public void addWindow(Window window) {
+        this.windows.add(window);
+    }
 
     public List<Ramp> getRamps() {
         return ramps;
@@ -663,13 +704,7 @@ public void setGlassFacadeOpenings(List<GlassFacadeOpening> glassFacadeOpenings)
         this.glassFacadeOpenings = glassFacadeOpenings;
     }
 
-    public List<Door> getDoors() {
-        return doors;
-    }
-
-    public void setDoors(List<Door> doors) {
-        this.doors = doors;
-    }
+
 
     public List<BigDecimal> getHeightFromFloorToBottomOfBeam() {
         return heightFromFloorToBottomOfBeam;

edcr/service/egov/egov-commons/src/main/java/org/egov/common/entity/edcr/Room.java

@@ -66,6 +66,9 @@ public class Room {
     private List<Occupancy> mezzanineAreas = new ArrayList<>();
 
     private List<Measurement> waterClosetVentialtion = new ArrayList<>();
+
+    private List<Window> windows = new ArrayList<>();
+
 
     public List<RoomHeight> getHeights() {
         return heightOfRooms;
@@ -151,5 +154,17 @@ public List<Occupancy> getMezzanineAreas() {
     public void setMezzanineAreas(List<Occupancy> mezzanineAreas) {
         this.mezzanineAreas = mezzanineAreas;
     }
+
+    public List<Window> getWindows() {
+  		return windows;
+  	}
+
+  	public void setWindows(List<Window> windows) {
+  		this.windows = windows;
+  	}
+
+  	public void addWindow(Window window) {
+          this.windows.add(window);
+      }
 
 }

edcr/service/egov/egov-commons/src/main/java/org/egov/common/entity/edcr/Window.java

@@ -0,0 +1,99 @@
+/*
+ * eGov  SmartCity eGovernance suite aims to improve the internal efficiency,transparency,
+ * accountability and the service delivery of the government  organizations.
+ *
+ *  Copyright (C) <2019>  eGovernments Foundation
+ *
+ *  The updated version of eGov suite of products as by eGovernments Foundation
+ *  is available at http://www.egovernments.org
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see http://www.gnu.org/licenses/ or
+ *  http://www.gnu.org/licenses/gpl.html .
+ *
+ *  In addition to the terms of the GPL license to be adhered to in using this
+ *  program, the following additional terms are to be complied with:
+ *
+ *      1) All versions of this program, verbatim or modified must carry this
+ *         Legal Notice.
+ *      Further, all user interfaces, including but not limited to citizen facing interfaces,
+ *         Urban Local Bodies interfaces, dashboards, mobile applications, of the program and any
+ *         derived works should carry eGovernments Foundation logo on the top right corner.
+ *
+ *      For the logo, please refer http://egovernments.org/html/logo/egov_logo.png.
+ *      For any further queries on attribution, including queries on brand guidelines,
+ *         please contact contact@egovernments.org
+ *
+ *      2) Any misrepresentation of the origin of the material is prohibited. It
+ *         is required that all modified versions of this material be marked in
+ *         reasonable ways as different from the original version.
+ *
+ *      3) This license does not grant any rights to any user of the program
+ *         with regards to rights under trademark law for use of the trade names
+ *         or trademarks of eGovernments Foundation.
+ *
+ *  In case of any queries, you can reach eGovernments Foundation at contact@egovernments.org.
+ */
+package org.egov.common.entity.edcr;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Window {
+
+private static final long serialVersionUID = 105L;
+
+    private String name;
+
+    private BigDecimal windowWidth;
+
+    private BigDecimal windowHeight;
+
+    private int colorCode;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public BigDecimal getWindowWidth() {
+		return windowWidth;
+	}
+
+	public void setWindowWidth(BigDecimal windowWidth) {
+		this.windowWidth = windowWidth;
+	}
+
+	public BigDecimal getWindowHeight() {
+		return windowHeight;
+	}
+
+	public void setWindowHeight(BigDecimal windowHeight) {
+		this.windowHeight = windowHeight;
+	}
+
+	public int getColorCode() {
+		return colorCode;
+	}
+
+	public void setColorCode(int colorCode) {
+		this.colorCode = colorCode;
+	}
+
+
+
+}

edcr/service/egov/egov-commons/src/main/resources/db/migration/main/V20240529133315__commons_dcr_door_window_layerrename.sql

@@ -0,0 +1,14 @@
+insert into state.egdcr_layername(id,key,value,createdby,createddate,lastmodifiedby,lastmodifieddate,version) 
+select nextval('state.seq_egdcr_layername'),'LAYER_NAME_DOOR','BLK_%s_FLR_%s_DOOR_%s',1,now(),1,now(),0 where not exists(select key from state.egdcr_layername where key='LAYER_NAME_DOOR');
+
+insert into state.egdcr_layername(id,key,value,createdby,createddate,lastmodifiedby,lastmodifieddate,version) 
+select nextval('state.seq_egdcr_layername'),'LAYER_NAME_WINDOW','BLK_%s_FLR_%s_WINDOW_%s',1,now(),1,now(),0 where not exists(select key from state.egdcr_layername where key='LAYER_NAME_WINDOW');
+
+
+insert into state.egdcr_layername(id,key,value,createdby,createddate,lastmodifiedby,lastmodifieddate,version) 
+select nextval('state.seq_egdcr_layername'),'LAYER_NAME_NON_HABITATIONAL_DOOR','BLK_%s_FLR_%s_NON_HABITATIONAL_DOOR_%s',1,now(),1,now(),0 where not exists(select key from state.egdcr_layername where key='LAYER_NAME_NON_HABITATIONAL_DOOR');
+
+
+insert into state.egdcr_layername(id,key,value,createdby,createddate,lastmodifiedby,lastmodifieddate,version) 
+select nextval('state.seq_egdcr_layername'),'LAYER_NAME_WINDOW_ROOM','BLK_%s_FLR_%s_WINDOW_%s_ROOM_%s',1,now(),1,now(),0 where not exists(select key from state.egdcr_layername where key='LAYER_NAME_WINDOW');
+