kanimozhi
/
GCC_Officer_Portal_updated
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

moditify the Dashboard and visit list at shelter inspection project

master
Dizho A 2 months ago
parent
d8f9b150c9
commit
50ed6ef9be
3 changed files with 306 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
  2. 134
      src/main/java/in/gov/chennaicorporation/gccoffice/shelterinspection/Controller/ShelterInspectionController.java
  3. 177
      src/main/resources/templates/modules/shelterinspection/visitlist.html

5
src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
View File

@ -30,9 +30,8 @@ public class DataSourceConfig {
// private static String dbpassword = "gccroot"; // private static String dbpassword = "gccroot";
// AWS // AWS
// private static String host =
// "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306";
// private static String dbpassword = "gcc-facial-password";
// private static String host = "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306";
// private static String dbpassword = "gcc-facial-password";
////////////////////////////// (For GCC APP) //////////////////////// ////////////////////////////// (For GCC APP) ////////////////////////
@Configuration @Configuration

134
src/main/java/in/gov/chennaicorporation/gccoffice/shelterinspection/Controller/ShelterInspectionController.java
View File

@ -5,11 +5,15 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import in.gov.chennaicorporation.gccoffice.configuration.AppConfig; import in.gov.chennaicorporation.gccoffice.configuration.AppConfig;
@ -143,15 +147,135 @@ public class ShelterInspectionController {
} }
@GetMapping("/questions") @GetMapping("/questions")
public ResponseEntity<?> getquestionsDetails(@RequestParam("cid") String cid){
String apiUrl = appConfig.shelterurl + "/questions?cid=" + cid;
return restTemplate.getForEntity(apiUrl, String.class);
public ResponseEntity<?> getquestionsDetails(
@RequestParam("cid") String cid) {
try {
String apiUrl =
appConfig.shelterurl + "/questions?cid=" + cid;
System.out.println(
"API URL for night inspection questions: " + apiUrl
);
ResponseEntity<Object> response =
restTemplate.getForEntity(
apiUrl,
Object.class
);
return ResponseEntity
.status(response.getStatusCode())
.body(response.getBody());
} catch (HttpClientErrorException e) {
System.out.println(
"Question API Client Error: " +
e.getStatusCode()
);
return ResponseEntity
.status(e.getStatusCode())
.body(e.getResponseBodyAsString());
} catch (HttpServerErrorException e) {
System.out.println(
"Question API Server Error: " +
e.getStatusCode()
);
return ResponseEntity
.status(e.getStatusCode())
.body(e.getResponseBodyAsString());
} catch (ResourceAccessException e) {
System.out.println(
"Question API Connection Error: " +
e.getMessage()
);
return ResponseEntity
.status(HttpStatus.BAD_GATEWAY)
.body(
Map.of(
"status", false,
"message",
"Unable to connect to Question Master API."
)
);
} catch (Exception e) {
System.out.println(
"Question API Exception"
);
e.printStackTrace();
return ResponseEntity
.status(HttpStatus.INTERNAL_SERVER_ERROR)
.body(
Map.of(
"status", false,
"message",
"Unable to load question details."
)
);
}
} }
// @GetMapping("/questions")
// public ResponseEntity<?> getquestionsDetails(@RequestParam("cid") String cid) {
//
// try {
//
// String apiUrl = appConfig.shelterurl + "/questions?cid=" + cid;
//
// System.out.println("apiUrl for night inspection questions:" +apiUrl);
//
// ResponseEntity<String> response =
// restTemplate.getForEntity(apiUrl, String.class);
//
// return ResponseEntity
// .status(response.getStatusCode())
// .body(response.getBody());
//
// } catch (HttpClientErrorException e) {
//
// return ResponseEntity
// .status(e.getStatusCode())
// .body(e.getResponseBodyAsString());
//
// } catch (HttpServerErrorException e) {
//
// return ResponseEntity
// .status(e.getStatusCode())
// .body(e.getResponseBodyAsString());
//
// } catch (ResourceAccessException e) {
//
// return ResponseEntity
// .status(HttpStatus.BAD_GATEWAY)
// .body("Unable to connect to Question Master API.");
//
// } catch (Exception e) {
//
// System.out.println("apiUrl for night inspection questions Exception.....");
// e.printStackTrace();
//
// return ResponseEntity
// .status(HttpStatus.INTERNAL_SERVER_ERROR)
// .body("Unable to load question details.");
//
// }
// }
// @GetMapping("/questions") // @GetMapping("/questions")
// public ResponseEntity<?> getQuestions(@RequestParam String cid) { // public ResponseEntity<?> getQuestions(@RequestParam String cid) {
// //

177
src/main/resources/templates/modules/shelterinspection/visitlist.html
View File

@ -738,7 +738,7 @@
</div> </div>
</div> </div>
<div class="modal-footer justify-content-between">
<!-- <div class="modal-footer justify-content-between">
<button class="btn btn-light" id="prevTabBtn"> <button class="btn btn-light" id="prevTabBtn">
<i class="fa fa-arrow-left"></i> Previous <i class="fa fa-arrow-left"></i> Previous
@ -748,7 +748,7 @@
Next <i class="fa fa-arrow-right"></i> Next <i class="fa fa-arrow-right"></i>
</button> </button>
</div>
</div> -->
</div> </div>
@ -1249,8 +1249,179 @@
//load question api //load question api
let questionMaster = []; let questionMaster = [];
function loadQuestionMaster(callback) {
$.ajax({
url: "/gcc/api/shelterinspection/questions",
type: "GET",
data: {
cid: 1
},
dataType: "json",
success: function(res) {
console.log("Question Master Response:", res);
if (res && res.data && Array.isArray(res.data)) {
questionMaster = res.data;
console.log(
"Question Master Loaded:",
questionMaster.length
);
if (callback) {
callback();
}
} else {
console.error(
"Question master data not found.",
res
);
questionMaster = [];
}
},
error: function(xhr, status, error) {
console.error(
"Question Master API Error:",
xhr.status,
error
);
console.error(
"Response:",
xhr.responseText
);
questionMaster = [];
let message = "Unable to load question master.";
if (xhr.status === 502) {
message =
"Question Master service is currently unavailable.";
} else if (xhr.status === 404) {
message =
"Question Master API was not found.";
} else if (xhr.status === 500) {
message =
"Internal server error while loading question master.";
} else if (xhr.status === 400) {
message =
"Invalid request for Question Master.";
}
console.error("Question Master Error:", message);
}
});
}
/* let questionMaster = [];
function loadQuestionMaster(callback) {
$.ajax({
url: "/gcc/api/shelterinspection/questions",
type: "GET",
data: {
cid: 1
},
success: function(res) {
console.log("Question Master Response:", res);
questionMaster = res.data;
if (res && res.data) {
questionMaster = res.data;
console.log(
"Question Master Loaded:",
questionMaster.length
);
if (callback) {
callback();
}
} else {
console.error("Question master data not found.");
questionMaster = [];
/* Swal.fire({
icon: "warning",
title: "Question Master",
text: "Question master data is not available.",
allowOutsideClick: false
}); *
}
},
error: function(xhr, status, error) {
console.error(
"Question Master API Error:",
xhr.status,
error
);
console.error(
"Response:",
xhr.responseText
);
questionMaster = [];
let message = "Unable to load question master.";
if (xhr.status === 502) {
message = "Question Master service is currently unavailable.";
}
else if (xhr.status === 404) {
message = "Question Master API was not found.";
}
else if (xhr.status === 500) {
message = "Internal server error while loading question master.";
}
/* Swal.fire({
icon: "error",
title: "Question Master Error",
text: message,
allowOutsideClick: false
}); *
}
});
} */
/* let questionMaster = [];
function loadQuestionMaster(callback){ function loadQuestionMaster(callback){
$.ajax({ $.ajax({
@ -1268,7 +1439,7 @@
} }
}); });
}
} */
function buildStaffList(answer){ function buildStaffList(answer){

Write Preview
Loading…
Cancel
Save