Officer`s report based on complaint`s
+ Makkalai Thedi Mayoral Module ++
| S.No | +Officer`s | +Off ID | +Event | +Total | +Completed | +Pending | +
|---|---|---|---|---|---|---|
| 0 | ++ | + | + | + | + | + |
| S.No | +Officer`s | +Event | +Off ID | +Total | +Completed | +Pending | +
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 47d7c97..2a93d6f 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 @@ -1,40 +1,22 @@ package in.gov.chennaicorporation.gccoffice.mtm.controller; -import java.util.Arrays; -import java.util.List; import javax.servlet.http.HttpSession; -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; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -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.MTMOfficer; 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; -import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetCategoryQuestion; -import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameter; -import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetParameterQuestions; -import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.AssetQuestion; -import in.gov.chennaicorporation.gccoffice.qrassetfeedback.data.Feedback; import in.gov.chennaicorporation.gccoffice.service.LoginUserInfo; @RequestMapping("/mtm/mayor") @@ -269,4 +251,26 @@ public class MayorController { return basePath+"/by-event-list"; } + + @GetMapping({"/by-officer-list"}) + public String showOfficerListReport(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-officer-list"; + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUrl) + .queryParam("mtmid",eventid); + MTMOfficer[] officerTableList = restTemplate.getForObject(builder.toUriString(), MTMOfficer[].class); + + model.addAttribute("officerTableList",officerTableList); + + baseUrl = appConfig.mtm + "/api/event-list"; + MtmEvent[] mtmEventsList = restTemplate.getForObject(baseUrl, MtmEvent[].class); + model.addAttribute("mtmEventsList",mtmEventsList); + + return basePath+"/by-officer-list"; + } } \ No newline at end of file diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/MTMOfficer.java b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/MTMOfficer.java new file mode 100644 index 0000000..cc8fd3a --- /dev/null +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/mtm/data/MTMOfficer.java @@ -0,0 +1,191 @@ +package in.gov.chennaicorporation.gccoffice.mtm.data; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +public class MTMOfficer { + private String mapId; + private String petitionNumber; + private String mtmEventsPetitionId; + private String mtmEvents; + private String offID; + private String status; + private String mtmComplaintTypes; + private String isDelete; + private String isActive; + private String createdBy; + private String cDate; + private String officerName; + private String eventName; + private String officerPetitionCount; + private String officerCompletedCount; + private String officerPendingCount; + + @JsonCreator + public MTMOfficer( + @JsonProperty("mapId") String mapId, + @JsonProperty("petitionNumber") String petitionNumber, + @JsonProperty("mtmEventsPetitionId") String mtmEventsPetitionId, + @JsonProperty("mtmEvents") String mtmEvents, + @JsonProperty("offID") String offID, + @JsonProperty("status") String status, + @JsonProperty("mtmComplaintTypes") String mtmComplaintTypes, + @JsonProperty("isDelete") String isDelete, + @JsonProperty("isActive") String isActive, + @JsonProperty("createdBy") String createdBy, + @JsonProperty("cDate") String cDate, + @JsonProperty("officer_name") String officerName, + @JsonProperty("event_name") String eventName, + @JsonProperty("officer_petition_count") String officerPetitionCount, + @JsonProperty("officer_completed_count") String officerCompletedCount, + @JsonProperty("officer_pending_count") String officerPendingCount + ) { + this.mapId = mapId; + this.petitionNumber = petitionNumber; + this.mtmEventsPetitionId = mtmEventsPetitionId; + this.mtmEvents = mtmEvents; + this.offID = offID; + this.status = status; + this.mtmComplaintTypes = mtmComplaintTypes; + this.isDelete = isDelete; + this.isActive = isActive; + this.createdBy = createdBy; + this.cDate = cDate; + this.officerName = officerName; + this.eventName = eventName; + this.officerPetitionCount = officerPetitionCount; + this.officerCompletedCount = officerCompletedCount; + this.officerPendingCount = officerPendingCount; + } + + public String getMapId() { + return mapId; + } + + public void setMapId(String mapId) { + this.mapId = mapId; + } + + public String getPetitionNumber() { + return petitionNumber; + } + + public void setPetitionNumber(String petitionNumber) { + this.petitionNumber = petitionNumber; + } + + public String getMtmEventsPetitionId() { + return mtmEventsPetitionId; + } + + public void setMtmEventsPetitionId(String mtmEventsPetitionId) { + this.mtmEventsPetitionId = mtmEventsPetitionId; + } + + public String getMtmEvents() { + return mtmEvents; + } + + public void setMtmEvents(String 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 String getMtmComplaintTypes() { + return mtmComplaintTypes; + } + + public void setMtmComplaintTypes(String mtmComplaintTypes) { + this.mtmComplaintTypes = mtmComplaintTypes; + } + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } + + public String getIsActive() { + return isActive; + } + + public void setIsActive(String isActive) { + this.isActive = isActive; + } + + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public String getcDate() { + return cDate; + } + + public void setcDate(String cDate) { + this.cDate = cDate; + } + + public String getOfficerName() { + return officerName; + } + + public void setOfficerName(String officerName) { + this.officerName = officerName; + } + + public String getEventName() { + return eventName; + } + + public void setEventName(String eventName) { + this.eventName = eventName; + } + + public String getOfficerPetitionCount() { + return officerPetitionCount; + } + + public void setOfficerPetitionCount(String officerPetitionCount) { + this.officerPetitionCount = officerPetitionCount; + } + + public String getOfficerCompletedCount() { + return officerCompletedCount; + } + + public void setOfficerCompletedCount(String officerCompletedCount) { + this.officerCompletedCount = officerCompletedCount; + } + + public String getOfficerPendingCount() { + return officerPendingCount; + } + + public void setOfficerPendingCount(String officerPendingCount) { + this.officerPendingCount = officerPendingCount; + } + + +} + diff --git a/src/main/resources/templates/fragments/modules/mtm/event_search_form.html b/src/main/resources/templates/fragments/modules/mtm/event_search_form.html index b04963c..c8bf83a 100644 --- a/src/main/resources/templates/fragments/modules/mtm/event_search_form.html +++ b/src/main/resources/templates/fragments/modules/mtm/event_search_form.html @@ -2,7 +2,7 @@
| S.No | +Officer`s | +Off ID | +Event | +Total | +Completed | +Pending | +
|---|---|---|---|---|---|---|
| 0 | ++ | + | + | + | + | + |
| S.No | +Officer`s | +Event | +Off ID | +Total | +Completed | +Pending | +