Application Menu view Order Added

src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java

@@ -35,7 +35,7 @@ public class DataSourceConfig {
             dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
             dataSource.setUrl("jdbc:mysql://localhost:3306/gcc_apps");
             dataSource.setUsername("root");
-            dataSource.setPassword("1");
+            dataSource.setPassword("");
             return dataSource;
         }
 /*

src/main/java/in/gov/chennaicorporation/gccoffice/entity/AppModuleEntity.java

@@ -23,6 +23,9 @@ public class AppModuleEntity {
 	
 	@Column(name = "icon",nullable = true)
     private String icon;
+	
+	@Column(name = "orderby",nullable = false, columnDefinition = "INTEGER default 0")
+    private Integer orderby;
     
     @Column(name = "isdelete",nullable = false, columnDefinition = "Boolean default false")
     private Boolean isDelete;
@@ -76,10 +79,20 @@ public class AppModuleEntity {
 		this.icon = icon;
 	}
 
-
+	
 	public void setModulePath(String modulePath) {
 		this.modulePath = modulePath;
 	}
+	
+	
+	public Integer getOrderby() {
+		return orderby;
+	}
+
+	
+	public void setOrderby(Integer orderby) {
+		this.orderby = orderby;
+	}
 
 
 	public Boolean getIsDelete() {

src/main/java/in/gov/chennaicorporation/gccoffice/entity/MenuItemEntity.java

@@ -30,6 +30,9 @@ public class MenuItemEntity {
 	@Column(name = "icon",nullable = true)
     private String icon;
 	
+	@Column(name = "orderby",nullable = false, columnDefinition = "INTEGER default 0")
+    private Integer orderby;
+	
 	@Column(name = "ishassub",nullable = false, columnDefinition = "Boolean default false")
     private Boolean hasSub;
     
@@ -96,10 +99,21 @@ public class MenuItemEntity {
 	}
 
 
+	public Integer getOrderby() {
+		return orderby;
+	}
+
+	
+	public void setOrderby(Integer orderby) {
+		this.orderby = orderby;
+	}
+	
+	
 	public void setIcon(String icon) {
 		this.icon = icon;
 	}
 
+	
 	public Boolean getHasSub() {
 		return hasSub;
 	}

src/main/java/in/gov/chennaicorporation/gccoffice/entity/SubMenuItemEntity.java

@@ -33,6 +33,9 @@ public class SubMenuItemEntity {
 	
 	@Column(name = "icon",nullable = true)
     private String icon;
+	
+	@Column(name = "orderby",nullable = false, columnDefinition = "INTEGER default 0")
+    private Integer orderby;
     
     @Column(name = "isdelete",nullable = false, columnDefinition = "Boolean default false")
     private Boolean isDelete;
@@ -112,6 +115,16 @@ public class SubMenuItemEntity {
 	}
 
 
+	public Integer getOrderby() {
+		return orderby;
+	}
+
+	
+	public void setOrderby(Integer orderby) {
+		this.orderby = orderby;
+	}
+	
+	
 	public Boolean getIsDelete() {
 		return isDelete;
 	}

src/main/java/in/gov/chennaicorporation/gccoffice/repository/AppModuleRepository.java

@@ -16,7 +16,7 @@ public interface AppModuleRepository extends JpaRepository<AppModuleEntity, Inte
 	@Query(value = "SELECT LAST_INSERT_ID()", nativeQuery = true)
     Integer getLastInsertedId();
 	
-	@Query(value = "SELECT * FROM `modules` WHERE `isactive`=1 AND `isdelete`=0", nativeQuery = true)
+	@Query(value = "SELECT * FROM `modules` WHERE `isactive`=1 AND `isdelete`=0 ORDER BY `orderby`", nativeQuery = true)
     List<AppModuleEntity> showAll();
 	
 	@Query(value = "SELECT * FROM `modules` WHERE `id` IN (:checkModuleid) AND (`isactive`=1 AND `isdelete`=0) ORDER BY `id`", nativeQuery = true)

src/main/java/in/gov/chennaicorporation/gccoffice/repository/MenuItemRepository.java

@@ -18,10 +18,10 @@ public interface MenuItemRepository extends JpaRepository<MenuItemEntity, Intege
 	@Query(value = "SELECT LAST_INSERT_ID()", nativeQuery = true)
     Integer getLastInsertedId();
 	
-	@Query(value = "SELECT * FROM `menuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND `module_id`=:module_id", nativeQuery = true)
+	@Query(value = "SELECT * FROM `menuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND `module_id`=:module_id ORDER BY `orderby`", nativeQuery = true)
     List<MenuItemEntity> getMenuItemByModuleId(@Param("module_id") int module_id);
 	
-	@Query(value = "SELECT * FROM `menuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND (`module_id`=:module_id AND `id` IN (:checkMenuid))", nativeQuery = true)
+	@Query(value = "SELECT * FROM `menuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND (`module_id`=:module_id AND `id` IN (:checkMenuid)) ORDER BY `orderby`", nativeQuery = true)
     List<MenuItemEntity> getMenuItemByModuleIdAccess(@Param("module_id") int module_id, String[] checkMenuid);
 	
 	@Query(value = "SELECT * FROM `menuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND (`url`=:url) LIMIT 0,1", nativeQuery = true)

src/main/java/in/gov/chennaicorporation/gccoffice/repository/SubMenuItemRepository.java

@@ -18,13 +18,13 @@ public interface SubMenuItemRepository extends JpaRepository<SubMenuItemEntity,
 	@Query(value = "SELECT LAST_INSERT_ID()", nativeQuery = true)
     Integer getLastInsertedId();
 	
-	@Query(value = "SELECT * FROM `submenuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND `module_id`=:module_id", nativeQuery = true)
+	@Query(value = "SELECT * FROM `submenuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND `module_id`=:module_id ORDER BY `orderby`", nativeQuery = true)
     List<SubMenuItemEntity> getSubMenuItemByModuleId(@Param("module_id") int module_id);
 	
-	@Query(value = "SELECT * FROM `submenuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND `menuitem_id`=:menuitem_id", nativeQuery = true)
+	@Query(value = "SELECT * FROM `submenuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND `menuitem_id`=:menuitem_id ORDER BY `orderby`", nativeQuery = true)
     List<SubMenuItemEntity> getSubMenuItemByMenuItemId(@Param("menuitem_id") int menuitem_id);
 	
-	@Query(value = "SELECT * FROM `submenuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND (`menuitem_id`=:menuitem_id AND `id` IN (:checkSubMenuid))", nativeQuery = true)
+	@Query(value = "SELECT * FROM `submenuitem` WHERE (`isactive`=1 AND `isdelete`=0) AND (`menuitem_id`=:menuitem_id AND `id` IN (:checkSubMenuid)) ORDER BY `orderby`", nativeQuery = true)
     List<SubMenuItemEntity> getSubMenuItemByMenuItemIdAccess(@Param("menuitem_id") int menuitem_id,String[] checkSubMenuid);
 	
 	@Query(value = "SELECT * FROM `submenuitem` WHERE (`url`=:url) AND (`isactive`=1 AND `isdelete`=0) LIMIT 0,1", nativeQuery = true)