diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/WhatsappController.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/WhatsappController.java
index 631ee871..a7e3a6de 100644
--- a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/WhatsappController.java
+++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/WhatsappController.java
@@ -56,11 +56,11 @@ public class WhatsappController {
String result = sendWhatsappMsg(pname, complaintTypeName, mobnumber, complaintNumber,returnedAction);
if(result.equals("200")) {
- System.out.println("Whatsapp Message Triggered for "+complaintNumber);
+ System.out.println(returnedAction+" Whatsapp Message Triggered for "+complaintNumber);
return true;
}
else {
- System.out.println("Whatsapp Message Failed for "+complaintNumber);
+ System.out.println(returnedAction+ " Whatsapp Message Failed for "+complaintNumber);
return false;
}
}
@@ -72,33 +72,37 @@ public class WhatsappController {
String urlString = "";
try {
-
+
+
+ String placeholders =
+ URLEncoder.encode(
+ pname + "|~|" + cat + "|~|" + complaintNumber,
+ StandardCharsets.UTF_8.toString());
+
+ String buttonPlaceholder =
+ URLEncoder.encode(
+ complaintNumber+ "|~|" +complaintNumber,
+ StandardCharsets.UTF_8.toString());
+
+ String mobile =
+ URLEncoder.encode(
+ mob_no,
+ StandardCharsets.UTF_8.toString());
+
if("COMPLETED".equalsIgnoreCase(returnedAction)) {
+ urlString="https://sendapiv1.pinbot.ai/pinwa/sendMessage?apikey=5c995535-6244-11f0-98fc-02c8a5e042bd&from=919445061913&to="+mobile+"&templateid=3304034&type=template&placeholders="+placeholders;
+
}
if("UNATTENDED".equalsIgnoreCase(returnedAction)) {
-
+
+
+ urlString="https://sendapiv1.pinbot.ai/pinwa/sendMessage?apikey=5c995535-6244-11f0-98fc-02c8a5e042bd&from=919445061913&to="+mobile+"&templateid=3304038&type=template&placeholders="+placeholders+"&button_placeholder="+buttonPlaceholder;
+
}
- String placeholders =
- URLEncoder.encode(
- pname + "|~|" + cat + "|~|" + complaintNumber,
- StandardCharsets.UTF_8.toString());
-
- String buttonPlaceholder =
- URLEncoder.encode(
- complaintNumber,
- StandardCharsets.UTF_8.toString());
-
- String mobile =
- URLEncoder.encode(
- mob_no,
- StandardCharsets.UTF_8.toString());
-
-
- urlString="";
String res = hitURL(urlString);
return res;
@@ -120,7 +124,7 @@ public class WhatsappController {
int responseCode = connection.getResponseCode();
response = String.valueOf(responseCode);
- //System.out.println("Response Code for URL: " + urlString + " is " + responseCode);
+ System.out.println("Response Code for Whatsapp msg URL: " + urlString + " is " + responseCode);
} catch (Exception e) {
e.printStackTrace();
@@ -129,17 +133,224 @@ public class WhatsappController {
return response;
}
- @GetMapping("/getclosefromuser")
+// @GetMapping("/getclosefromuser")
+// public String getclosefromuser(@RequestParam String complaintNumber) {
+//
+// return whatsappqaqcMsgService.getclosefromuser(complaintNumber);
+//
+// }
+
+ @GetMapping(value = "/getclosefromuser", produces = "text/html")
public String getclosefromuser(@RequestParam String complaintNumber) {
-
- return whatsappqaqcMsgService.getclosefromuser(complaintNumber);
-
+
+ String result = whatsappqaqcMsgService.getclosefromuser(complaintNumber);
+
+ boolean success = result.contains("Successfully");
+ String color = success ? "#28a745" : "#dc3545";
+
+ String logoUrl = "https://gccservices.in/gcc/assets/images/logo.png";
+
+ //background: #f5f5f5;
+
+ return """
+
+
+
+
+ GCC PGR Complaint Status
+
+
+
+
+
+
+ """.formatted(color, logoUrl, result);
}
- @GetMapping("/getreopenfromuser")
+
+ @GetMapping(value="/getreopenfromuser", produces = "text/html")
public String getreopenfromuser(@RequestParam String complaintNumber) {
- return whatsappqaqcMsgService.getreopenfromuser(complaintNumber);
+ String result= whatsappqaqcMsgService.getreopenfromuser(complaintNumber);
+
+ boolean success = result.contains("Successfully");
+ String color = success ? "#28a745" : "#dc3545";
+
+ String logoUrl = "https://gccservices.in/gcc/assets/images/logo.png";
+
+ //background: #f5f5f5;
+
+ return """
+
+
+
+
+ GCC PGR Complaint Status
+
+
+
+
+
+
+ """.formatted(color, logoUrl, result);
}
diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/WhatsappqaqcMsgService.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/WhatsappqaqcMsgService.java
index 1e7b012e..28b73925 100644
--- a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/WhatsappqaqcMsgService.java
+++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/WhatsappqaqcMsgService.java
@@ -88,7 +88,7 @@ public class WhatsappqaqcMsgService {
String sql =
"SELECT call_status " +
"FROM qaqc_upload_data_history " +
- "WHERE complaint_number=? " +
+ "WHERE complaint_number=? AND call_category='CLOSED' " +
"ORDER BY id DESC " +
"LIMIT 20";
@@ -121,7 +121,7 @@ public class WhatsappqaqcMsgService {
String sql =
"SELECT call_status " +
"FROM qaqc_upload_data_history " +
- "WHERE complaint_number=? " +
+ "WHERE complaint_number=? AND call_category='CLOSED' " +
"ORDER BY id DESC " +
"LIMIT 5";
@@ -150,6 +150,15 @@ public class WhatsappqaqcMsgService {
return response;
}
+
+
+ public String getErpusername() {
+
+ String query="SELECT erp_username FROM agents_list "
+ + "where calling_type='WHATSAPP_MSG'";
+
+ return jdbcTemplate.queryForObject(query,String.class);
+ }
public String getclosefromuser(String complaintNumber) {
@@ -164,27 +173,42 @@ public class WhatsappqaqcMsgService {
)
);
- String Erpname="QAops72";
+
+
+ String Erpname=getErpusername();
+
+ System.out.println("Erpname="+Erpname);
if ("Action Taken - Level 2".equalsIgnoreCase(currentStatus)) {
- boolean statusUpdated=qaqcCallsService.ChangeStatusInErp(complaintNumber, "", "COMPLETED",Erpname);
+ boolean statusUpdated=qaqcCallsService.ChangeStatusInErp(complaintNumber, "COMPLAINT CLOSED BY WHATSAPP MESSAGE", "COMPLETED",Erpname);
if (statusUpdated)
{
- return complaintNumber+ " PGR Complaint closed Successfully";
+ return "Your "+complaintNumber+ " PGR Complaint has been closed Successfully.\n If you need further assistance,\n Please contact GCC 1913 Helpline.";
}
else {
- return "Unable to close "+complaintNumber+" PGR Complaint";
+ return "We are unable to process your request at the moment.\n Please try again later.";
}
- }
+ }
else {
- return "Unable to close PGR "+complaintNumber+" Complaint,Because the complaint status is "+currentStatus;
+ if("FINAL_CLOSURE".equalsIgnoreCase(currentStatus)){
+
+ return "Your " + complaintNumber + " complaint has already been closed.\n\n"
+ + "If you need further assistance, please contact GCC 1913 Helpline.";
+
+ }
+ else if("REOPENED".equalsIgnoreCase(currentStatus)) {
+ return "Your "+complaintNumber+" complaint has already been reopened. Once it is resolved, we will reach you by GCC’s 1913 helpline. If you need further assistance, please contact GCC 1913 Helpline.";
+ }
+ else {
+ return "Your "+complaintNumber+" complaint is Under Progress.\n Once it is resolved, \n we will reach you by GCC’s 1913 helpline.";
+ }
}
} catch (Exception e) {
e.printStackTrace();
- return "Error in closing PGR complaint from user "+complaintNumber;
+ return "We are unable to process your request at the moment.\n Please try again later.";
}
@@ -204,27 +228,40 @@ public class WhatsappqaqcMsgService {
)
);
- String Erpname="QAops72";
+ String Erpname=getErpusername();
+
+ System.out.println("Erpname="+Erpname);
if ("Action Taken - Level 2".equalsIgnoreCase(currentStatus)) {
- boolean statusUpdated=qaqcCallsService.ChangeStatusInErp(complaintNumber, "", "REOPEN",Erpname);
+ boolean statusUpdated=qaqcCallsService.ChangeStatusInErp(complaintNumber, "COMPLAINT REOPENED BY WHATSAPP MESSAGE", "REOPEN",Erpname);
if (statusUpdated)
{
- return complaintNumber+ " Complaint Reopened Successfully";
+ return "Your "+complaintNumber+ " PGR complaint has been reopened Successfully.\n Once it is resolved , we will reach you by GCC’s 1913 helpline.If you need further assistance , please contact GCC 1913 Helpline.";
}
else {
- return "Unable to Reopen "+complaintNumber+" Complaint";
+ return "We are unable to process your request at the moment.\n Please try again later.";
}
}
else {
- return "Unable to Reopen "+complaintNumber+" Complaint,Because the complaint status is "+currentStatus;
+
+ if("FINAL_CLOSURE".equalsIgnoreCase(currentStatus)){
+
+ return "Your " + complaintNumber + " complaint has already been closed.\n\n"
+ + "If you need further assistance, please contact GCC 1913 Helpline.";
+ }
+ else if("REOPENED".equalsIgnoreCase(currentStatus)) {
+ return "Your "+complaintNumber+" complaint has already been reopened. Once it is resolved, we will reach you by GCC’s 1913 helpline. If you have any further assistance, please contact GCC 1913 Helpline.";
+ }
+ else {
+ return "Your "+complaintNumber+" complaint is Under Progress.\n Once it is resolved, \n we will reach you by GCC’s 1913 helpline.";
+ }
}
} catch (Exception e) {
e.printStackTrace();
- return "Error in Reopen complaint from user "+complaintNumber;
+ return "We are unable to process your request at the moment.\n Please try again later.";
}
diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
index 58618a80..36b516dd 100644
--- a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
+++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
@@ -24,14 +24,14 @@ import java.util.Properties;
@EnableTransactionManagement
public class DataSourceConfig {
-// private static String host = "localhost:3306";
-// private static String dbpassword = "root";
+ private static String host = "localhost:3306";
+ private static String dbpassword = "root";
// private static String dbpassword = "gccroot";
// 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) ////////////////////////
@Configuration
@@ -407,6 +407,17 @@ public class DataSourceConfig {
dataSource.setPassword(dbpassword);
return dataSource;
}
+
+ /////////////// Road War /////////////////////
+ @Bean(name = "mysqlRoadWarDataSource")
+ public DataSource mysqlRoadWarDataSource() {
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
+ dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+ dataSource.setUrl("jdbc:mysql://" + host + "/gcc_roadwar_web");
+ dataSource.setUsername("root");
+ dataSource.setPassword(dbpassword);
+ return dataSource;
+ }
////////////////////////////// ORACLE ////////////////////////
@Bean(name = "oracleDataSource")
diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/greencommittee/service/PendinglistService.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/greencommittee/service/PendinglistService.java
index ab8e53fa..005323be 100644
--- a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/greencommittee/service/PendinglistService.java
+++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/greencommittee/service/PendinglistService.java
@@ -244,7 +244,7 @@ public class PendinglistService {
// 4a — Recommendation details
List> recommend = jdbcTemplate.queryForList(
- "SELECT rm.name, itd.nooftrees AS count " +
+ "SELECT rm.name, itd.nooftrees AS count,itd.treename as treename " +
"FROM inspection_tree_data itd " +
"JOIN inspection_recommend_master rm ON rm.rid = itd.action " +
"WHERE itd.inspection_data_id=? AND itd.isactive=1",
diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/Maincontroller.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/Maincontroller.java
new file mode 100644
index 00000000..2a5e6e03
--- /dev/null
+++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/Maincontroller.java
@@ -0,0 +1,30 @@
+package in.gov.chennaicorporation.gccoffice.roadwar.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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 in.gov.chennaicorporation.gccoffice.service.LoginUserInfo;
+
+@RequestMapping("/gcc/roadwarweb")
+@Controller("RoadWarMainController")
+public class Maincontroller {
+
+ @Autowired
+ private LoginUserInfo loginUserInfo;
+
+
+ @GetMapping("/regform")
+ public String viewdashboard(Model model) {
+ String LoginUserId = LoginUserInfo.getLoginUserId();
+ model.addAttribute("LoginUserId", LoginUserId);
+
+ String UserRole = LoginUserInfo.getUserRole();
+ model.addAttribute("UserRole", UserRole);
+
+ return "modules/roadwar/regform";
+ }
+
+}
diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/RegisterApiController.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/RegisterApiController.java
new file mode 100644
index 00000000..9754a3a3
--- /dev/null
+++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/RegisterApiController.java
@@ -0,0 +1,64 @@
+package in.gov.chennaicorporation.gccoffice.roadwar.controller;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.bind.annotation.RestController;
+
+import in.gov.chennaicorporation.gccoffice.roadwar.service.RegisterService;
+
+@RestController
+@RequestMapping("/gcc/api/roadwarweb/register")
+public class RegisterApiController {
+
+
+ @Autowired
+ private RegisterService registerService;
+
+
+ @GetMapping("/getzones")
+ public Map ViewZoneDropdown() {
+
+ Map response = new HashMap<>();
+
+ List> zones = registerService.ViewZoneDropdown();
+
+ if (!zones.isEmpty()) {
+ response.put("status", true);
+ response.put("message", "Zone list fetched successfully");
+ response.put("data", zones);
+ } else {
+ response.put("status", false);
+ response.put("message", "No zones found");
+ response.put("data", Collections.emptyList());
+ }
+
+ return response;
+ }
+
+ @GetMapping("/getwardbyzone")
+ public Map ViewWardDropdown(@RequestParam String zone) {
+
+ Map response = new HashMap<>();
+
+ List> wards = registerService.ViewWardDropdown(zone);
+
+ if (!wards.isEmpty()) {
+ response.put("status", true);
+ response.put("message", "Ward list fetched successfully");
+ response.put("data", wards);
+ } else {
+ response.put("status", false);
+ response.put("message", "No wards found");
+ response.put("data", Collections.emptyList());
+ }
+
+ return response;
+ }
+}
diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/service/RegisterService.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/service/RegisterService.java
new file mode 100644
index 00000000..061d02be
--- /dev/null
+++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/service/RegisterService.java
@@ -0,0 +1,58 @@
+package in.gov.chennaicorporation.gccoffice.roadwar.service;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.env.Environment;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RegisterService {
+
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
+
+ @Autowired
+ private Environment environment;
+
+ @Autowired
+ public void setDataSource(@Qualifier("mysqlRoadWarDataSource") DataSource dataSource) {
+ this.jdbcTemplate = new JdbcTemplate(dataSource);
+ }
+
+
+ public List> ViewZoneDropdown() {
+ String sql = "SELECT zone_name "
+ + "FROM zone_master "
+ + "WHERE is_active=1 AND is_delete=0";
+ try {
+ return jdbcTemplate.queryForList(sql);
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return Collections.emptyList();
+ }
+ }
+
+ public List> ViewWardDropdown(String zone) {
+ String sql = "SELECT ward_name "
+ + "FROM ward_master "
+ + "WHERE is_active=1 AND is_delete=0 AND zone_id=?";
+ try {
+ return jdbcTemplate.queryForList(sql,zone);
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ return Collections.emptyList();
+ }
+ }
+
+
+
+}
diff --git a/gcc_officer_portal/src/main/resources/application.properties b/gcc_officer_portal/src/main/resources/application.properties
index 376e518b..ad06f8ad 100644
--- a/gcc_officer_portal/src/main/resources/application.properties
+++ b/gcc_officer_portal/src/main/resources/application.properties
@@ -1,5 +1,5 @@
-#spring.profiles.active=local
-spring.profiles.active=production
+spring.profiles.active=local
+#spring.profiles.active=production
#For Server production
#assets.base-url=/gcc/assets/
#For local test
diff --git a/gcc_officer_portal/src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html b/gcc_officer_portal/src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html
index ffb241a2..8497b358 100644
--- a/gcc_officer_portal/src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html
+++ b/gcc_officer_portal/src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html
@@ -780,18 +780,10 @@
//console.log("valid phone number");
$('.submitid').prop('disabled', false).text('Submit');
// Trigger WhatsApp message functions based on action
-// if (action === "UNATTENDED") {
- //sendWhatsAppMessageUnattended(name, complaintNumber, cellnumber, complaintTypeName);
-// } else if (action === "REOPEN") {
- //sendWhatsAppMessageReopened(name, complaintNumber, cellnumber, complaintTypeName);
-// }
-
-
-
- if (action === "UNATTENDED" || action === "COMPLETED" ) {
-
- //checkforUnattendedwhatsappmsg(complaintNumber,action,complaintTypeName,cellnumber,name);
- }
+
+/* if (action === "UNATTENDED" || action === "COMPLETED" ) {
+ checkforUnattendedwhatsappmsg(complaintNumber,action,complaintTypeName,cellnumber,name);
+ } */
}
else{
@@ -1035,13 +1027,16 @@ return detailsHtml;
//checkforwhatsappmsg
function checkforUnattendedwhatsappmsg(complaintNumber,action,complaintTypeName,cellnumber,name) {
+
+
+ console.log(complaintNumber);
$.ajax({
url: '/gcc/api/qaqc/whatsapp/checkforwhatsappmsg',
type: 'GET',
data: { complaintNumber: complaintNumber,action:action,
complaintTypeName:complaintTypeName,mobnumber:cellnumber,
- name:pname},
+ pname:name},
success: function(response) {
//console.log('WhatsApp message sent successfully', response);
console.log(response);
diff --git a/gcc_officer_portal/src/main/resources/templates/modules/greencommittee/monitoring.html b/gcc_officer_portal/src/main/resources/templates/modules/greencommittee/monitoring.html
index dec67239..4972af2a 100644
--- a/gcc_officer_portal/src/main/resources/templates/modules/greencommittee/monitoring.html
+++ b/gcc_officer_portal/src/main/resources/templates/modules/greencommittee/monitoring.html
@@ -407,7 +407,7 @@ function fetchgreenCommitteeList(){
renderDetails(details);
- $('#viewModalLabel').text(`Apploication Details - ${id}`);
+ $('#viewModalLabel').text(`Application Details - ${id}`);
$('#viewModal').modal('show');
},
error: function (xhr) {
diff --git a/gcc_officer_portal/src/main/resources/templates/modules/greencommittee/pendinglist.html b/gcc_officer_portal/src/main/resources/templates/modules/greencommittee/pendinglist.html
index d5aab49b..3545b93d 100644
--- a/gcc_officer_portal/src/main/resources/templates/modules/greencommittee/pendinglist.html
+++ b/gcc_officer_portal/src/main/resources/templates/modules/greencommittee/pendinglist.html
@@ -566,7 +566,7 @@
let inspCards = inspections.map(ins => {
let recChips = ins.recommendations.map(r =>
- `${r.name}: ${r.count}`
+ `${r.name}: ${r.count} (${r.treename})`
).join("");
let inspThumbs = ins.images.map(i =>
@@ -815,7 +815,7 @@
loadCommitteeDecisions();
- $('#viewModalLabel').text(`Apploication Details - ${id}`);
+ $('#viewModalLabel').text(`Application Details - ${id}`);
$('#viewModal').modal('show');
},
error: function (xhr) {
diff --git a/gcc_officer_portal/src/main/resources/templates/modules/roadwar/regform.html b/gcc_officer_portal/src/main/resources/templates/modules/roadwar/regform.html
new file mode 100644
index 00000000..548bba67
--- /dev/null
+++ b/gcc_officer_portal/src/main/resources/templates/modules/roadwar/regform.html
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Loading...
+
+
+
Please wait...
+
+
+
+
+
+
+