diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/APIController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/APIController.java index e477b78..f4e9a79 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/APIController.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/APIController.java @@ -105,4 +105,15 @@ public class APIController { return bodyMessage; } + + @GetMapping(value = "/getComMappingDetailsByMapId") + public String getComMappingDetailsByMapId(@RequestParam String mapid) { + String baseURL = appConfig.mtm+"/api/getComMappingDetailsByMapId"; + UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(baseURL) + .queryParam("mapid", mapid); + + ResponseEntity response = restTemplate.getForEntity(uriComponentsBuilder.toUriString(),String.class); + bodyMessage = response.getBody().trim(); + return bodyMessage; + } } diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/MayorController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/MayorController.java index e54572b..47d7c97 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/MayorController.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/controller/MayorController.java @@ -8,6 +8,8 @@ import javax.websocket.Session; import org.apache.catalina.User; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -17,11 +19,14 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; +import com.fasterxml.jackson.databind.JsonNode; + import in.gov.chennaicorporation.gccoffice.configuration.AppConfig; import in.gov.chennaicorporation.gccoffice.controller.login; import in.gov.chennaicorporation.gccoffice.mtm.data.MtmComplaintTypes; import in.gov.chennaicorporation.gccoffice.mtm.data.MtmEvent; import in.gov.chennaicorporation.gccoffice.mtm.data.Petition; +import in.gov.chennaicorporation.gccoffice.mtm.data.PetitionComplaint; import in.gov.chennaicorporation.gccoffice.petregistration.data.RequestList; import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.Asset; import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetCategory; @@ -71,12 +76,13 @@ public class MayorController { baseUrl = appConfig.mtm + "/api/event-list"; MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); model.addAttribute("mtmEventsList",mtmEventsList); - + /* baseUrl = appConfig.mtm + "/api/complainttypes"; MtmComplaintTypes[] mtmComplaintTypesList = restTemplate.getForObject(baseUrl, MtmComplaintTypes[].class); model.addAttribute("complaintTypesList",mtmComplaintTypesList); //System.out.println("Length: "+mtmComplaintTypesList.length); + */ return basePath+"/petition-list"; } @@ -98,12 +104,13 @@ public class MayorController { baseUrl = appConfig.mtm + "/api/event-list"; MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); model.addAttribute("mtmEventsList",mtmEventsList); - + /* baseUrl = appConfig.mtm + "/api/complainttypes"; MtmComplaintTypes[] mtmComplaintTypesList = restTemplate.getForObject(baseUrl, MtmComplaintTypes[].class); model.addAttribute("complaintTypesList",mtmComplaintTypesList); - //System.out.println("Length: "+mtmComplaintTypesList.length); + //System.out.println("Length: "+mtmComplaintTypesList.length); + */ return basePath+"/completed-petition-list"; } @@ -125,12 +132,14 @@ public class MayorController { baseUrl = appConfig.mtm + "/api/event-list"; MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); model.addAttribute("mtmEventsList",mtmEventsList); - + /* baseUrl = appConfig.mtm + "/api/complainttypes"; MtmComplaintTypes[] mtmComplaintTypesList = restTemplate.getForObject(baseUrl, MtmComplaintTypes[].class); model.addAttribute("complaintTypesList",mtmComplaintTypesList); //System.out.println("Length: "+mtmComplaintTypesList.length); + + */ return basePath+"/partial-petition-list"; } @@ -152,12 +161,112 @@ public class MayorController { baseUrl = appConfig.mtm + "/api/event-list"; MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); model.addAttribute("mtmEventsList",mtmEventsList); - + /* baseUrl = appConfig.mtm + "/api/complainttypes"; MtmComplaintTypes[] mtmComplaintTypesList = restTemplate.getForObject(baseUrl, MtmComplaintTypes[].class); model.addAttribute("complaintTypesList",mtmComplaintTypesList); - //System.out.println("Length: "+mtmComplaintTypesList.length); + //System.out.println("Length: "+mtmComplaintTypesList.length); + * + */ return basePath+"/pending-petition-list"; } + + @GetMapping({"/complaint-list"}) + public String showComplaintList(Model model,HttpSession session) { + + String eventid = "0"; + + if(session.getAttribute("eventid")!= null && !session.getAttribute("eventid").equals("0")){ + eventid = session.getAttribute("eventid").toString(); + } + String baseUrl = appConfig.mtm + "/api/mayor/complaint-list"; + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUrl) + .queryParam("mtmid",eventid); + PetitionComplaint[] petitionList = restTemplate.getForObject(builder.toUriString(), PetitionComplaint[].class); + model.addAttribute("petitionlist",petitionList); + + baseUrl = appConfig.mtm + "/api/event-list"; + MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); + model.addAttribute("mtmEventsList",mtmEventsList); + /* + baseUrl = appConfig.mtm + "/api/complainttypes"; + MtmComplaintTypes[] mtmComplaintTypesList = restTemplate.getForObject(baseUrl, MtmComplaintTypes[].class); + model.addAttribute("complaintTypesList",mtmComplaintTypesList); + */ + + return basePath+"/complaint-list"; + } + + @GetMapping({"/completed-complaint-list"}) + public String showCompletedComplaintList(Model model,HttpSession session) { + + String eventid = "0"; + + if(session.getAttribute("eventid")!= null && !session.getAttribute("eventid").equals("0")){ + eventid = session.getAttribute("eventid").toString(); + } + String baseUrl = appConfig.mtm + "/api/mayor/completed-complaint-list"; + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUrl) + .queryParam("mtmid",eventid); + PetitionComplaint[] petitionList = restTemplate.getForObject(builder.toUriString(), PetitionComplaint[].class); + model.addAttribute("petitionlist",petitionList); + + baseUrl = appConfig.mtm + "/api/event-list"; + MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); + model.addAttribute("mtmEventsList",mtmEventsList); + /* + baseUrl = appConfig.mtm + "/api/complainttypes"; + MtmComplaintTypes[] mtmComplaintTypesList = restTemplate.getForObject(baseUrl, MtmComplaintTypes[].class); + model.addAttribute("complaintTypesList",mtmComplaintTypesList); + */ + + return basePath+"/completed-complaint-list"; + } + + @GetMapping({"/pending-complaint-list"}) + public String showPendingComplaintList(Model model,HttpSession session) { + + String eventid = "0"; + + if(session.getAttribute("eventid")!= null && !session.getAttribute("eventid").equals("0")){ + eventid = session.getAttribute("eventid").toString(); + } + String baseUrl = appConfig.mtm + "/api/mayor/pending-complaint-list"; + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUrl) + .queryParam("mtmid",eventid); + PetitionComplaint[] petitionList = restTemplate.getForObject(builder.toUriString(), PetitionComplaint[].class); + model.addAttribute("petitionlist",petitionList); + + baseUrl = appConfig.mtm + "/api/event-list"; + MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); + model.addAttribute("mtmEventsList",mtmEventsList); + /* + baseUrl = appConfig.mtm + "/api/complainttypes"; + MtmComplaintTypes[] mtmComplaintTypesList = restTemplate.getForObject(baseUrl, MtmComplaintTypes[].class); + model.addAttribute("complaintTypesList",mtmComplaintTypesList); + */ + return basePath+"/completed-complaint-list"; + } + + @GetMapping({"/by-event-list"}) + public String showEventListReport(Model model,HttpSession session) { + + String eventid = "0"; + + if(session.getAttribute("eventid")!= null && !session.getAttribute("eventid").equals("0")){ + eventid = session.getAttribute("eventid").toString(); + } + String baseUrl = appConfig.mtm + "/api/mayor/by-event-list"; + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUrl) + .queryParam("mtmid",eventid); + MtmEvent[] mtmEventsTableList = restTemplate.getForObject(builder.toUriString(), MtmEvent[].class); + model.addAttribute("mtmEventsTableList",mtmEventsTableList); + + baseUrl = appConfig.mtm + "/api/event-list"; + MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); + model.addAttribute("mtmEventsList",mtmEventsList); + + return basePath+"/by-event-list"; + } } \ No newline at end of file diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/Petition.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/Petition.java index 569ba31..cc300f7 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/Petition.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/Petition.java @@ -3,9 +3,6 @@ package in.gov.chennaicorporation.gccoffice.mtm.data; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameterQuestions.AssetCategory; -import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameterQuestions.AssetParameter; - public class Petition { private Long petitionId; private MtmEvents mtmEvents; diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/PetitionComplaint.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/PetitionComplaint.java new file mode 100644 index 0000000..b9a9aa4 --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/PetitionComplaint.java @@ -0,0 +1,461 @@ +package in.gov.chennaicorporation.gccoffice.mtm.data; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +public class PetitionComplaint { + private int mapId; + private String petitionNumber; + private MtmEventsPetitionId mtmEventsPetitionId; + private MtmEvents mtmEvents; + private String offID; + private String status; + private MtmComplaintTypes mtmComplaintTypes; + private boolean isDelete; + private boolean isActive; + private int createdBy; + private String cDate; + private String officer_name; + private String event_name; + private Integer officer_petition_count; + private Integer officer_completed_count; + private Integer officer_pending_count; + + // Getters and setters for the above fields + + public int getMapId() { + return mapId; + } + + public void setMapId(int mapId) { + this.mapId = mapId; + } + + public String getPetitionNumber() { + return petitionNumber; + } + + public void setPetitionNumber(String petitionNumber) { + this.petitionNumber = petitionNumber; + } + + public MtmEventsPetitionId getMtmEventsPetitionId() { + return mtmEventsPetitionId; + } + + public void setMtmEventsPetitionId(MtmEventsPetitionId mtmEventsPetitionId) { + this.mtmEventsPetitionId = mtmEventsPetitionId; + } + + public MtmEvents getMtmEvents() { + return mtmEvents; + } + + public void setMtmEvents(MtmEvents mtmEvents) { + this.mtmEvents = mtmEvents; + } + + public String getOffID() { + return offID; + } + + public void setOffID(String offID) { + this.offID = offID; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public MtmComplaintTypes getMtmComplaintTypes() { + return mtmComplaintTypes; + } + + public void setMtmComplaintTypes(MtmComplaintTypes mtmComplaintTypes) { + this.mtmComplaintTypes = mtmComplaintTypes; + } + + public boolean isDelete() { + return isDelete; + } + + public void setDelete(boolean isDelete) { + this.isDelete = isDelete; + } + + public boolean isActive() { + return isActive; + } + + public void setActive(boolean isActive) { + this.isActive = isActive; + } + + public int getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(int createdBy) { + this.createdBy = createdBy; + } + + public String getcDate() { + return cDate; + } + + public void setcDate(String cDate) { + this.cDate = cDate; + } + + public String getOfficer_name() { + return officer_name; + } + + public void setOfficer_name(String officer_name) { + this.officer_name = officer_name; + } + + public String getEvent_name() { + return event_name; + } + + public void setEvent_name(String event_name) { + this.event_name = event_name; + } + + public Integer getOfficer_petition_count() { + return officer_petition_count; + } + + public void setOfficer_petition_count(Integer officer_petition_count) { + this.officer_petition_count = officer_petition_count; + } + + public Integer getOfficer_completed_count() { + return officer_completed_count; + } + + public void setOfficer_completed_count(Integer officer_completed_count) { + this.officer_completed_count = officer_completed_count; + } + + public Integer getOfficer_pending_count() { + return officer_pending_count; + } + + public void setOfficer_pending_count(Integer officer_pending_count) { + this.officer_pending_count = officer_pending_count; + } + + public static class MtmEventsPetitionId { + private int petitionId; + private MtmEvents mtmEvents; + private String petitionNumber; + private String petitionerName; + private long petitionerMobile; + private String petitionerComplaint; + private String petitionerAddress; + private String petitionerPincode; + private String petitionerNatureOfComplaint; + private String tableNo; + private boolean isDelete; + private boolean isActive; + private long createdBy; + private String cDate; + private String status; + private String petitionerComplaint_txt; + + // Getters and setters for the above fields + public int getPetitionId() { + return petitionId; + } + public void setPetitionId(int petitionId) { + this.petitionId = petitionId; + } + public MtmEvents getMtmEvents() { + return mtmEvents; + } + public void setMtmEvents(MtmEvents mtmEvents) { + this.mtmEvents = mtmEvents; + } + public String getPetitionNumber() { + return petitionNumber; + } + public void setPetitionNumber(String petitionNumber) { + this.petitionNumber = petitionNumber; + } + public String getPetitionerName() { + return petitionerName; + } + public void setPetitionerName(String petitionerName) { + this.petitionerName = petitionerName; + } + public long getPetitionerMobile() { + return petitionerMobile; + } + public void setPetitionerMobile(long petitionerMobile) { + this.petitionerMobile = petitionerMobile; + } + public String getPetitionerComplaint() { + return petitionerComplaint; + } + public void setPetitionerComplaint(String petitionerComplaint) { + this.petitionerComplaint = petitionerComplaint; + } + public String getPetitionerAddress() { + return petitionerAddress; + } + public void setPetitionerAddress(String petitionerAddress) { + this.petitionerAddress = petitionerAddress; + } + public String getPetitionerPincode() { + return petitionerPincode; + } + public void setPetitionerPincode(String petitionerPincode) { + this.petitionerPincode = petitionerPincode; + } + public String getPetitionerNatureOfComplaint() { + return petitionerNatureOfComplaint; + } + public void setPetitionerNatureOfComplaint(String petitionerNatureOfComplaint) { + this.petitionerNatureOfComplaint = petitionerNatureOfComplaint; + } + public String getTableNo() { + return tableNo; + } + public void setTableNo(String tableNo) { + this.tableNo = tableNo; + } + public boolean isDelete() { + return isDelete; + } + public void setDelete(boolean isDelete) { + this.isDelete = isDelete; + } + public boolean isActive() { + return isActive; + } + public void setActive(boolean isActive) { + this.isActive = isActive; + } + public long getCreatedBy() { + return createdBy; + } + public void setCreatedBy(long createdBy) { + this.createdBy = createdBy; + } + public String getcDate() { + return cDate; + } + public void setcDate(String cDate) { + this.cDate = cDate; + } + public String getStatus() { + return status; + } + public void setStatus(String status) { + this.status = status; + } + public String getPetitionerComplaint_txt() { + return petitionerComplaint_txt; + } + public void setPetitionerComplaint_txt(String petitionerComplaint_txt) { + this.petitionerComplaint_txt = petitionerComplaint_txt; + } + + + } + + public static class MtmEvents { + private int mtmId; + private String eventName; + private String eventAddress; + private String eventDate; + private String zone; + private String ackNo; + private long startPetId; + private boolean isDelete; + private boolean isActive; + private long createdBy; + private String cDate; + private String event_date; + private Long total_petitions; + private Long petitions_completed; + private Long petition_partially_completed; + private Long petitions_pending; + private Long total_compliants; + private Long compliants_completed; + private Long compliants_pending; + + + // Getters and setters for the above fields + public int getMtmId() { + return mtmId; + } + public void setMtmId(int mtmId) { + this.mtmId = mtmId; + } + public String getEventName() { + return eventName; + } + public void setEventName(String eventName) { + this.eventName = eventName; + } + public String getEventAddress() { + return eventAddress; + } + public void setEventAddress(String eventAddress) { + this.eventAddress = eventAddress; + } + public String getEventDate() { + return eventDate; + } + public void setEventDate(String eventDate) { + this.eventDate = eventDate; + } + public String getZone() { + return zone; + } + public void setZone(String zone) { + this.zone = zone; + } + public String getAckNo() { + return ackNo; + } + public void setAckNo(String ackNo) { + this.ackNo = ackNo; + } + public long getStartPetId() { + return startPetId; + } + public void setStartPetId(long startPetId) { + this.startPetId = startPetId; + } + public boolean isDelete() { + return isDelete; + } + public void setDelete(boolean isDelete) { + this.isDelete = isDelete; + } + public boolean isActive() { + return isActive; + } + public void setActive(boolean isActive) { + this.isActive = isActive; + } + public long getCreatedBy() { + return createdBy; + } + public void setCreatedBy(long createdBy) { + this.createdBy = createdBy; + } + public String getcDate() { + return cDate; + } + public void setcDate(String cDate) { + this.cDate = cDate; + } + public String getEvent_date() { + return event_date; + } + public void setEvent_date(String event_date) { + this.event_date = event_date; + } + public Long getTotal_petitions() { + return total_petitions; + } + public void setTotal_petitions(Long total_petitions) { + this.total_petitions = total_petitions; + } + public Long getPetitions_completed() { + return petitions_completed; + } + public void setPetitions_completed(Long petitions_completed) { + this.petitions_completed = petitions_completed; + } + public Long getPetition_partially_completed() { + return petition_partially_completed; + } + public void setPetition_partially_completed(Long petition_partially_completed) { + this.petition_partially_completed = petition_partially_completed; + } + public Long getPetitions_pending() { + return petitions_pending; + } + public void setPetitions_pending(Long petitions_pending) { + this.petitions_pending = petitions_pending; + } + public Long getTotal_compliants() { + return total_compliants; + } + public void setTotal_compliants(Long total_compliants) { + this.total_compliants = total_compliants; + } + public Long getCompliants_completed() { + return compliants_completed; + } + public void setCompliants_completed(Long compliants_completed) { + this.compliants_completed = compliants_completed; + } + public Long getCompliants_pending() { + return compliants_pending; + } + public void setCompliants_pending(Long compliants_pending) { + this.compliants_pending = compliants_pending; + } + + + } + + public static class MtmComplaintTypes { + private int complaintTypeId; + private String complaintType; + private boolean isDelete; + private boolean isActive; + private int createdBy; + private String cDate; + + // Getters and setters for the above fields + public int getComplaintTypeId() { + return complaintTypeId; + } + public void setComplaintTypeId(int complaintTypeId) { + this.complaintTypeId = complaintTypeId; + } + public String getComplaintType() { + return complaintType; + } + public void setComplaintType(String complaintType) { + this.complaintType = complaintType; + } + public boolean isDelete() { + return isDelete; + } + public void setDelete(boolean isDelete) { + this.isDelete = isDelete; + } + public boolean isActive() { + return isActive; + } + public void setActive(boolean isActive) { + this.isActive = isActive; + } + public int getCreatedBy() { + return createdBy; + } + public void setCreatedBy(int createdBy) { + this.createdBy = createdBy; + } + public String getcDate() { + return cDate; + } + public void setcDate(String cDate) { + this.cDate = cDate; + } + + } +} \ No newline at end of file diff --git a/src/main/resources/.DS_Store b/src/main/resources/.DS_Store index 40d0542..cdfabfd 100644 Binary files a/src/main/resources/.DS_Store and b/src/main/resources/.DS_Store differ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0b04585..4e2a10e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,8 +2,8 @@ server.port = 8064 #server.servlet.context-path=/gccoffice server.error.include-stacktrace= on_param # Hibernate logging -logging.level.org.hibernate.SQL=DEBUG -logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE +#logging.level.org.hibernate.SQL=DEBUG +#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE # Enable CORS globally for all endpoints spring.webmvc.cors.enabled=true @@ -28,4 +28,9 @@ server.servlet.session.tracking-modes=COOKIE file.upload.directory=${user.dir}/gccoffice_uploads -server.address=0.0.0.0 \ No newline at end of file +server.address=0.0.0.0 + +server.servlet.session.timeout: 30m +server.servlet.session.cookie.name: MYSESSIONID +server.servlet.session.cookie.max-age: 1800s + diff --git a/src/main/resources/static/.DS_Store b/src/main/resources/static/.DS_Store index 313b62a..fc36538 100644 Binary files a/src/main/resources/static/.DS_Store and b/src/main/resources/static/.DS_Store differ diff --git a/src/main/resources/static/assets/.DS_Store b/src/main/resources/static/assets/.DS_Store index 45b3960..fa835cb 100644 Binary files a/src/main/resources/static/assets/.DS_Store and b/src/main/resources/static/assets/.DS_Store differ diff --git a/src/main/resources/static/assets/images/logo-sm.png b/src/main/resources/static/assets/images/logo-sm.png new file mode 100644 index 0000000..ad13bc1 Binary files /dev/null and b/src/main/resources/static/assets/images/logo-sm.png differ diff --git a/src/main/resources/static/assets/js/.DS_Store b/src/main/resources/static/assets/js/.DS_Store index 008cdf1..5d42744 100644 Binary files a/src/main/resources/static/assets/js/.DS_Store and b/src/main/resources/static/assets/js/.DS_Store differ diff --git a/src/main/resources/static/assets/node_modules/.DS_Store b/src/main/resources/static/assets/node_modules/.DS_Store index 4ae819b..137c785 100644 Binary files a/src/main/resources/static/assets/node_modules/.DS_Store and b/src/main/resources/static/assets/node_modules/.DS_Store differ diff --git a/src/main/resources/static/assets/node_modules/datatable/.DS_Store b/src/main/resources/static/assets/node_modules/datatable/.DS_Store new file mode 100644 index 0000000..7a32a99 Binary files /dev/null and b/src/main/resources/static/assets/node_modules/datatable/.DS_Store differ diff --git a/src/main/resources/static/assets/node_modules/datatable/DataTables-1.13.6/.DS_Store b/src/main/resources/static/assets/node_modules/datatable/DataTables-1.13.6/.DS_Store new file mode 100644 index 0000000..4fd2d04 Binary files /dev/null and b/src/main/resources/static/assets/node_modules/datatable/DataTables-1.13.6/.DS_Store differ diff --git a/src/main/resources/templates/.DS_Store b/src/main/resources/templates/.DS_Store index 7f99f14..cff074d 100644 Binary files a/src/main/resources/templates/.DS_Store and b/src/main/resources/templates/.DS_Store differ diff --git a/src/main/resources/templates/fragments/.DS_Store b/src/main/resources/templates/fragments/.DS_Store index 5f9996b..dd04de5 100644 Binary files a/src/main/resources/templates/fragments/.DS_Store and b/src/main/resources/templates/fragments/.DS_Store differ diff --git a/src/main/resources/templates/fragments/modules/base/head.html b/src/main/resources/templates/fragments/modules/base/head.html index 2fac858..00b8658 100644 --- a/src/main/resources/templates/fragments/modules/base/head.html +++ b/src/main/resources/templates/fragments/modules/base/head.html @@ -85,5 +85,20 @@ .custom-tooltip-warning .tooltip.bs-tooltip-left .arrow:before { border-left-color: #fb6340; } + + .form-label{ + font-weight: bold !important; + } + .modal-header{ + color:#fff !important; + background-color: #404E67 !important; + } + .bg-modal-title{ + background-color: rgb(220, 221, 226) !important; + } + + .close{ + color: #fff !important; + } \ No newline at end of file diff --git a/src/main/resources/templates/fragments/modules/base/script.html b/src/main/resources/templates/fragments/modules/base/script.html index f9c6465..9c3cd69 100644 --- a/src/main/resources/templates/fragments/modules/base/script.html +++ b/src/main/resources/templates/fragments/modules/base/script.html @@ -86,6 +86,62 @@ function call_loading(div,action){ $(divID).html(loadingimage) } } + +// Date format +function convertdate(date_txt){ + var datetxt = date_txt; + var date = new Date(datetxt); + + // Extract the date components + var day = date.getDate(); + var month = date.getMonth() + 1; // Month starts from 0, so add 1 + var year = date.getFullYear(); + + // Extract the time components + var hours = date.getHours(); + var minutes = date.getMinutes(); + + // Determine if it's AM or PM + var period = hours >= 12 ? 'PM' : 'AM'; + + // Adjust the hours to 12-hour format + hours = hours % 12; + hours = hours ? hours : 12; // Handle the case when hours is 0 + + // Format the date and time string + //var formattedDate = `${day}/${month}/${year}`; + //var formattedTime = `${hours}:${minutes.toString().padStart(2, '0')} ${period}`; + + // Format the date and time strings + var formattedDate = `${day.toString().padStart(2, '0')}-${month.toString().padStart(2, '0')}-${year}`; + var formattedTime = `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')} ${period}`; + + // Concatenate the formatted date and time + var formattedDateTime = `${formattedDate} ${formattedTime}`; + + return formattedDateTime; +} + +function date_difference(fromdate,todate,type='time'){ + + // Parse the date strings into moment objects with the specified format + var startDate = moment(fromdate, 'DD-MM-YYYY hh:mm A'); + var endDate = moment(todate, 'DD-MM-YYYY hh:mm A'); + + // Calculate the difference in days + var daysDifference = endDate.diff(startDate, 'days'); + + // Calculate the remaining time components (hours, minutes) + var duration = moment.duration(endDate - startDate); + var hoursDifference = duration.hours(); + var minutesDifference = duration.minutes(); + // Display the result + if(type=='days'){ + return daysDifference + ' days'; + }else{ + return (hoursDifference) + ' hours and ' + (minutesDifference) + ' minutes'; + } +} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/modules/mtm/script.html b/src/main/resources/templates/fragments/modules/mtm/script.html new file mode 100644 index 0000000..ed637ed --- /dev/null +++ b/src/main/resources/templates/fragments/modules/mtm/script.html @@ -0,0 +1,709 @@ + \ No newline at end of file diff --git a/src/main/resources/templates/modules/.DS_Store b/src/main/resources/templates/modules/.DS_Store index f85495b..4440303 100644 Binary files a/src/main/resources/templates/modules/.DS_Store and b/src/main/resources/templates/modules/.DS_Store differ diff --git a/src/main/resources/templates/modules/mtm/index.html b/src/main/resources/templates/modules/mtm/index.html new file mode 100644 index 0000000..ffa9d79 --- /dev/null +++ b/src/main/resources/templates/modules/mtm/index.html @@ -0,0 +1,237 @@ + + + + + + + +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+ +
+ + + + + + + + diff --git a/src/main/resources/templates/modules/mtm/mayor/by-event-list.html b/src/main/resources/templates/modules/mtm/mayor/by-event-list.html new file mode 100644 index 0000000..1a7626c --- /dev/null +++ b/src/main/resources/templates/modules/mtm/mayor/by-event-list.html @@ -0,0 +1,204 @@ + + + + + + + +
+ +
+ + +
+ +
+ +
+
+ + +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Event InfoPetitionsCompliants
S.NoNameDateTotalCompletedPartiallyPendingTotalCompletedPending
0
Event InfoPetitionsCompliants
S.NoNameDateTotalCompletedPartiallyPendingTotalCompletedPending
+
+
+
+
+
+ +
+
+ +
+
+
+ +
+ +
+ + + + + + diff --git a/src/main/resources/templates/modules/mtm/mayor/complaint-list.html b/src/main/resources/templates/modules/mtm/mayor/complaint-list.html new file mode 100644 index 0000000..2f0a7b8 --- /dev/null +++ b/src/main/resources/templates/modules/mtm/mayor/complaint-list.html @@ -0,0 +1,208 @@ + + + + + + + +
+ +
+ + +
+ +
+ +
+
+ + +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S.NoPetition No.NameMobileAddressType of complaintDepartment(Officer)StatusAction
0 + + Pending + + + Close + + + + + + +
S.NoPetition No.NameMobileAddressType of complaintDepartment(Officer)StatusAction
+
+
+
+
+
+ +
+
+ +
+
+
+ +
+ +
+ + + + + + diff --git a/src/main/resources/templates/modules/mtm/mayor/completed-complaint-list.html b/src/main/resources/templates/modules/mtm/mayor/completed-complaint-list.html new file mode 100644 index 0000000..ca04503 --- /dev/null +++ b/src/main/resources/templates/modules/mtm/mayor/completed-complaint-list.html @@ -0,0 +1,208 @@ + + + + + + + +
+ +
+ + +
+ +
+ +
+
+ + +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S.NoPetition No.NameMobileAddressType of complaintDepartment(Officer)StatusAction
0 + + Pending + + + Close + + + + + + +
S.NoPetition No.NameMobileAddressType of complaintDepartment(Officer)StatusAction
+
+
+
+
+
+ +
+
+ +
+
+
+ +
+ +
+ + + + + + diff --git a/src/main/resources/templates/modules/mtm/mayor/completed-petition-list.html b/src/main/resources/templates/modules/mtm/mayor/completed-petition-list.html new file mode 100644 index 0000000..843c494 --- /dev/null +++ b/src/main/resources/templates/modules/mtm/mayor/completed-petition-list.html @@ -0,0 +1,185 @@ + + + + + + + +
+ +
+ + +
+ +
+ +
+
+ + +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S.NoPetition No.NameMobileAddressPostal codeType of complaintStatusAction
0 + + + + +
S.NoPetition No.NameMobileAddressPostal codeType of complaintStatusAction
+
+
+
+
+
+ +
+
+ +
+
+
+ +
+ +
+ + + + + + diff --git a/src/main/resources/templates/modules/mtm/mayor/index.html b/src/main/resources/templates/modules/mtm/mayor/index.html new file mode 100644 index 0000000..ac26212 --- /dev/null +++ b/src/main/resources/templates/modules/mtm/mayor/index.html @@ -0,0 +1,238 @@ + + + + + + + +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+ +
+ + + + + + + + + diff --git a/src/main/resources/templates/modules/mtm/mayor/partial-petition-list.html b/src/main/resources/templates/modules/mtm/mayor/partial-petition-list.html new file mode 100644 index 0000000..dff3b7d --- /dev/null +++ b/src/main/resources/templates/modules/mtm/mayor/partial-petition-list.html @@ -0,0 +1,185 @@ + + + + + + + +
+ +
+ + +
+ +
+ +
+
+ + +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S.NoPetition No.NameMobileAddressPostal codeType of complaintStatusAction
0 + + + + +
S.NoPetition No.NameMobileAddressPostal codeType of complaintStatusAction
+
+
+
+
+
+ +
+
+ +
+
+
+ +
+ +
+ + + + + + diff --git a/src/main/resources/templates/modules/mtm/mayor/pending-complaint-list.html b/src/main/resources/templates/modules/mtm/mayor/pending-complaint-list.html new file mode 100644 index 0000000..3ef00d7 --- /dev/null +++ b/src/main/resources/templates/modules/mtm/mayor/pending-complaint-list.html @@ -0,0 +1,208 @@ + + + + + + + +
+ +
+ + +
+ +
+ +
+
+ + +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S.NoPetition No.NameMobileAddressType of complaintDepartment(Officer)StatusAction
0 + + Pending + + + Close + + + + + + +
S.NoPetition No.NameMobileAddressType of complaintDepartment(Officer)StatusAction
+
+
+
+
+
+ +
+
+ +
+
+
+ +
+ +
+ + + + + + diff --git a/src/main/resources/templates/modules/mtm/mayor/pending-petition-list.html b/src/main/resources/templates/modules/mtm/mayor/pending-petition-list.html new file mode 100644 index 0000000..f3b8570 --- /dev/null +++ b/src/main/resources/templates/modules/mtm/mayor/pending-petition-list.html @@ -0,0 +1,185 @@ + + + + + + + +
+ +
+ + +
+ +
+ +
+
+ + +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S.NoPetition No.NameMobileAddressPostal codeType of complaintStatusAction
0 + + + + +
S.NoPetition No.NameMobileAddressPostal codeType of complaintStatusAction
+
+
+
+
+
+ +
+
+ +
+
+
+ +
+ +
+ + + + + + diff --git a/src/main/resources/templates/modules/mtm/mayor/petition-list.html b/src/main/resources/templates/modules/mtm/mayor/petition-list.html new file mode 100644 index 0000000..f2d0217 --- /dev/null +++ b/src/main/resources/templates/modules/mtm/mayor/petition-list.html @@ -0,0 +1,185 @@ + + + + + + + +
+ +
+ + +
+ +
+ +
+
+ + +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S.NoPetition No.NameMobileAddressPostal codeType of complaintStatusAction
0 + + + + +
S.NoPetition No.NameMobileAddressPostal codeType of complaintStatusAction
+
+
+
+
+
+ +
+
+ +
+
+
+ +
+ +
+ + + + + + diff --git a/src/main/resources/templates/modules/mtm/officer/index.html b/src/main/resources/templates/modules/mtm/officer/index.html new file mode 100644 index 0000000..ffa9d79 --- /dev/null +++ b/src/main/resources/templates/modules/mtm/officer/index.html @@ -0,0 +1,237 @@ + + + + + + + +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+ +
+ + + + + + + + diff --git a/src/main/resources/templates/modules/qrfeedback/.DS_Store b/src/main/resources/templates/modules/qrfeedback/.DS_Store index 04190cc..1e941f5 100644 Binary files a/src/main/resources/templates/modules/qrfeedback/.DS_Store and b/src/main/resources/templates/modules/qrfeedback/.DS_Store differ