diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..228ea62 Binary files /dev/null and b/.DS_Store differ diff --git a/AnalyseClient/.gitignore b/AnalyseClient/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/AnalyseClient/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/AnalyseClient/target/classes/ClientOfAnalyzer.class b/AnalyseClient/target/classes/ClientOfAnalyzer.class old mode 100755 new mode 100644 diff --git a/AnalyseClient/target/classes/META-INF/MANIFEST.MF b/AnalyseClient/target/classes/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index 3cbb63e..a301ee8 --- a/AnalyseClient/target/classes/META-INF/MANIFEST.MF +++ b/AnalyseClient/target/classes/META-INF/MANIFEST.MF @@ -1,4 +1,4 @@ Manifest-Version: 1.0 -Build-Jdk-Spec: 22 +Build-Jdk-Spec: 23 Created-By: Maven Integration for Eclipse diff --git a/AnalyseClient/target/classes/META-INF/maven/fr.insa.soap/ClientWS/pom.properties b/AnalyseClient/target/classes/META-INF/maven/fr.insa.soap/ClientWS/pom.properties deleted file mode 100755 index 523cc07..0000000 --- a/AnalyseClient/target/classes/META-INF/maven/fr.insa.soap/ClientWS/pom.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Generated by Maven Integration for Eclipse -#Wed Oct 02 17:53:07 CEST 2024 -artifactId=ClientWS -groupId=fr.insa.soap -m2e.projectLocation=/home/nbillard/eclipse-workspace/AnalyseClient -m2e.projectName=AnalyseClient -version=0.0.1-SNAPSHOT diff --git a/AnalyseClient/target/classes/META-INF/maven/fr.insa.soap/ClientWS/pom.xml b/AnalyseClient/target/classes/META-INF/maven/fr.insa.soap/ClientWS/pom.xml deleted file mode 100755 index 9319292..0000000 --- a/AnalyseClient/target/classes/META-INF/maven/fr.insa.soap/ClientWS/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - -4.0.0 -fr.insa.soap -ClientWS -0.0.1-SNAPSHOT - -11 -3.4.2 - - - - -com.sun.xml.ws -jaxws-rt -2.3.3 - - - - - -org.apache.cxf -cxf-codegen-plugin -${cxf.version} - - -generate-sources -generate-sources - - -${project.build.directory}/generated-sources/cxf - - - -${basedir}/src/main/resources/wsdl/analyzer.wsdl - -fr.insa.soap.wsdltojava - - - - - -wsdl2java - - - - - - - \ No newline at end of file diff --git a/AnalyseClient/target/classes/META-INF/maven/fr.insa.ws.soap/AnalyseClient/pom.properties b/AnalyseClient/target/classes/META-INF/maven/fr.insa.ws.soap/AnalyseClient/pom.properties old mode 100755 new mode 100644 index 7f4e015..070c7d2 --- a/AnalyseClient/target/classes/META-INF/maven/fr.insa.ws.soap/AnalyseClient/pom.properties +++ b/AnalyseClient/target/classes/META-INF/maven/fr.insa.ws.soap/AnalyseClient/pom.properties @@ -1,7 +1,7 @@ #Generated by Maven Integration for Eclipse -#Tue Oct 08 14:15:42 CEST 2024 +#Fri Nov 29 14:16:23 CET 2024 artifactId=AnalyseClient groupId=fr.insa.ws.soap -m2e.projectLocation=/home/nbillard/eclipse-workspace/AnalyseClient +m2e.projectLocation=/Users/juanito/Desktop/master/Tercer Cuatri/SOA/SOA/AnalyseClient m2e.projectName=AnalyseClient version=0.0.1-SNAPSHOT diff --git a/AnalyseClient/target/classes/META-INF/maven/fr.insa.ws.soap/AnalyseClient/pom.xml b/AnalyseClient/target/classes/META-INF/maven/fr.insa.ws.soap/AnalyseClient/pom.xml old mode 100755 new mode 100644 diff --git a/AnalyseClient/target/classes/fr/insa/soap/wsdltojava/AnalyserChaineWS.class b/AnalyseClient/target/classes/fr/insa/soap/wsdltojava/AnalyserChaineWS.class old mode 100755 new mode 100644 diff --git a/AnalyseClient/target/classes/fr/insa/soap/wsdltojava/Analyzer.class b/AnalyseClient/target/classes/fr/insa/soap/wsdltojava/Analyzer.class old mode 100755 new mode 100644 diff --git a/AnalyseClient/target/classes/fr/insa/soap/wsdltojava/Compare.class b/AnalyseClient/target/classes/fr/insa/soap/wsdltojava/Compare.class old mode 100755 new mode 100644 diff --git a/AnalyseClient/target/classes/fr/insa/soap/wsdltojava/CompareResponse.class b/AnalyseClient/target/classes/fr/insa/soap/wsdltojava/CompareResponse.class old mode 100755 new mode 100644 diff --git a/AnalyseClient/target/classes/fr/insa/soap/wsdltojava/ObjectFactory.class b/AnalyseClient/target/classes/fr/insa/soap/wsdltojava/ObjectFactory.class old mode 100755 new mode 100644 diff --git a/AnalyseClient/target/classes/fr/insa/soap/wsdltojava/package-info.class b/AnalyseClient/target/classes/fr/insa/soap/wsdltojava/package-info.class old mode 100755 new mode 100644 diff --git a/Benevolat/.gitignore b/Benevolat/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/Benevolat/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/Benevolat/target/classes/META-INF/MANIFEST.MF b/Benevolat/target/classes/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index 3cbb63e..a301ee8 --- a/Benevolat/target/classes/META-INF/MANIFEST.MF +++ b/Benevolat/target/classes/META-INF/MANIFEST.MF @@ -1,4 +1,4 @@ Manifest-Version: 1.0 -Build-Jdk-Spec: 22 +Build-Jdk-Spec: 23 Created-By: Maven Integration for Eclipse diff --git a/Benevolat/target/classes/META-INF/maven/fr.insa.ws.soap/Benevolat/pom.properties b/Benevolat/target/classes/META-INF/maven/fr.insa.ws.soap/Benevolat/pom.properties old mode 100755 new mode 100644 index 5a406a5..19f88ed --- a/Benevolat/target/classes/META-INF/maven/fr.insa.ws.soap/Benevolat/pom.properties +++ b/Benevolat/target/classes/META-INF/maven/fr.insa.ws.soap/Benevolat/pom.properties @@ -1,7 +1,7 @@ #Generated by Maven Integration for Eclipse -#Wed Nov 13 16:02:17 CET 2024 +#Fri Nov 29 14:16:24 CET 2024 artifactId=Benevolat groupId=fr.insa.ws.soap -m2e.projectLocation=/home/cameros-torr/Bureau/SOA/Benevolat +m2e.projectLocation=/Users/juanito/Desktop/master/Tercer Cuatri/SOA/SOA/Benevolat m2e.projectName=Benevolat version=0.0.1-SNAPSHOT diff --git a/Benevolat/target/classes/META-INF/maven/fr.insa.ws.soap/Benevolat/pom.xml b/Benevolat/target/classes/META-INF/maven/fr.insa.ws.soap/Benevolat/pom.xml old mode 100755 new mode 100644 diff --git a/Benevolat/target/classes/fr/insa/soap/AnalyserChaineApplication.class b/Benevolat/target/classes/fr/insa/soap/AnalyserChaineApplication.class old mode 100755 new mode 100644 diff --git a/Benevolat/target/classes/fr/insa/soap/AnalyserChaineWS.class b/Benevolat/target/classes/fr/insa/soap/AnalyserChaineWS.class old mode 100755 new mode 100644 diff --git a/NumberConversion/.gitignore b/NumberConversion/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/NumberConversion/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/NumberConversion/target/classes/META-INF/MANIFEST.MF b/NumberConversion/target/classes/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index 3cbb63e..a301ee8 --- a/NumberConversion/target/classes/META-INF/MANIFEST.MF +++ b/NumberConversion/target/classes/META-INF/MANIFEST.MF @@ -1,4 +1,4 @@ Manifest-Version: 1.0 -Build-Jdk-Spec: 22 +Build-Jdk-Spec: 23 Created-By: Maven Integration for Eclipse diff --git a/NumberConversion/target/classes/META-INF/maven/fr.insa.soap/NumberConversion/pom.properties b/NumberConversion/target/classes/META-INF/maven/fr.insa.soap/NumberConversion/pom.properties old mode 100755 new mode 100644 index c24a0e5..be74fa4 --- a/NumberConversion/target/classes/META-INF/maven/fr.insa.soap/NumberConversion/pom.properties +++ b/NumberConversion/target/classes/META-INF/maven/fr.insa.soap/NumberConversion/pom.properties @@ -1,7 +1,7 @@ #Generated by Maven Integration for Eclipse -#Tue Oct 08 14:51:58 CEST 2024 +#Fri Nov 29 14:16:25 CET 2024 artifactId=NumberConversion groupId=fr.insa.soap -m2e.projectLocation=/home/nbillard/eclipse-workspace/NumberConversion +m2e.projectLocation=/Users/juanito/Desktop/master/Tercer Cuatri/SOA/SOA/NumberConversion m2e.projectName=NumberConversion version=0.0.1-SNAPSHOT diff --git a/NumberConversion/target/classes/META-INF/maven/fr.insa.soap/NumberConversion/pom.xml b/NumberConversion/target/classes/META-INF/maven/fr.insa.soap/NumberConversion/pom.xml old mode 100755 new mode 100644 diff --git a/NumberConversion/target/classes/NumberConversionTester.class b/NumberConversion/target/classes/NumberConversionTester.class old mode 100755 new mode 100644 diff --git a/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberConversion.class b/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberConversion.class old mode 100755 new mode 100644 index fe76a79..aa38b62 Binary files a/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberConversion.class and b/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberConversion.class differ diff --git a/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberConversionSoapType.class b/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberConversionSoapType.class old mode 100755 new mode 100644 diff --git a/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberToDollars.class b/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberToDollars.class old mode 100755 new mode 100644 diff --git a/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberToDollarsResponse.class b/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberToDollarsResponse.class old mode 100755 new mode 100644 diff --git a/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberToWords.class b/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberToWords.class old mode 100755 new mode 100644 diff --git a/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberToWordsResponse.class b/NumberConversion/target/classes/fr/insa/soap/wsdltojava/NumberToWordsResponse.class old mode 100755 new mode 100644 diff --git a/NumberConversion/target/classes/fr/insa/soap/wsdltojava/ObjectFactory.class b/NumberConversion/target/classes/fr/insa/soap/wsdltojava/ObjectFactory.class old mode 100755 new mode 100644 diff --git a/NumberConversion/target/classes/fr/insa/soap/wsdltojava/package-info.class b/NumberConversion/target/classes/fr/insa/soap/wsdltojava/package-info.class old mode 100755 new mode 100644 diff --git a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberConversion.java b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberConversion.java old mode 100755 new mode 100644 index 0dc813c..60f5eb3 --- a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberConversion.java +++ b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberConversion.java @@ -12,12 +12,12 @@ import javax.xml.ws.Service; * The Number Conversion Web Service, implemented with Visual DataFlex, provides functions that convert numbers into words or dollar amounts. * * This class was generated by Apache CXF 3.4.2 - * 2024-10-08T14:41:29.112+02:00 + * 2024-11-21T15:31:21.220+01:00 * Generated source version: 3.4.2 * */ @WebServiceClient(name = "NumberConversion", - wsdlLocation = "file:/home/nbillard/eclipse-workspace/NumberConversion/src/main/resources/wsdl/numberconversion.wsdl", + wsdlLocation = "file:/Users/juanito/Desktop/master/Tercer%20Cuatri/SOA/SOA/NumberConversion/src/main/resources/wsdl/numberconversion.wsdl", targetNamespace = "http://www.dataaccess.com/webservicesserver/") public class NumberConversion extends Service { @@ -29,11 +29,11 @@ public class NumberConversion extends Service { static { URL url = null; try { - url = new URL("file:/home/nbillard/eclipse-workspace/NumberConversion/src/main/resources/wsdl/numberconversion.wsdl"); + url = new URL("file:/Users/juanito/Desktop/master/Tercer%20Cuatri/SOA/SOA/NumberConversion/src/main/resources/wsdl/numberconversion.wsdl"); } catch (MalformedURLException e) { java.util.logging.Logger.getLogger(NumberConversion.class.getName()) .log(java.util.logging.Level.INFO, - "Can not initialize the default wsdl from {0}", "file:/home/nbillard/eclipse-workspace/NumberConversion/src/main/resources/wsdl/numberconversion.wsdl"); + "Can not initialize the default wsdl from {0}", "file:/Users/juanito/Desktop/master/Tercer%20Cuatri/SOA/SOA/NumberConversion/src/main/resources/wsdl/numberconversion.wsdl"); } WSDL_LOCATION = url; } diff --git a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberConversionSoapType.java b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberConversionSoapType.java old mode 100755 new mode 100644 index 8a03af1..7fe21ec --- a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberConversionSoapType.java +++ b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberConversionSoapType.java @@ -10,7 +10,7 @@ import javax.xml.ws.ResponseWrapper; /** * This class was generated by Apache CXF 3.4.2 - * 2024-10-08T14:41:29.064+02:00 + * 2024-11-21T15:31:21.191+01:00 * Generated source version: 3.4.2 * */ diff --git a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToDollars.java b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToDollars.java old mode 100755 new mode 100644 index 3a7f305..c944368 --- a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToDollars.java +++ b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToDollars.java @@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType; /** - * <p>Classe Java pour anonymous complex type. + * <p>Clase Java para anonymous complex type. * - * <p>Le fragment de schéma suivant indique le contenu attendu figurant dans cette classe. + * <p>El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. * * <pre> * &lt;complexType&gt; @@ -39,7 +39,7 @@ public class NumberToDollars { protected BigDecimal dNum; /** - * Obtient la valeur de la propriété dNum. + * Obtiene el valor de la propiedad dNum. * * @return * possible object is @@ -51,7 +51,7 @@ public class NumberToDollars { } /** - * Définit la valeur de la propriété dNum. + * Define el valor de la propiedad dNum. * * @param value * allowed object is diff --git a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToDollarsResponse.java b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToDollarsResponse.java old mode 100755 new mode 100644 index 1d5b8d7..7d78643 --- a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToDollarsResponse.java +++ b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToDollarsResponse.java @@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType; /** - * <p>Classe Java pour anonymous complex type. + * <p>Clase Java para anonymous complex type. * - * <p>Le fragment de schéma suivant indique le contenu attendu figurant dans cette classe. + * <p>El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. * * <pre> * &lt;complexType&gt; @@ -38,7 +38,7 @@ public class NumberToDollarsResponse { protected String numberToDollarsResult; /** - * Obtient la valeur de la propriété numberToDollarsResult. + * Obtiene el valor de la propiedad numberToDollarsResult. * * @return * possible object is @@ -50,7 +50,7 @@ public class NumberToDollarsResponse { } /** - * Définit la valeur de la propriété numberToDollarsResult. + * Define el valor de la propiedad numberToDollarsResult. * * @param value * allowed object is diff --git a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToWords.java b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToWords.java old mode 100755 new mode 100644 index 07b7685..9c9f753 --- a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToWords.java +++ b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToWords.java @@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType; /** - * <p>Classe Java pour anonymous complex type. + * <p>Clase Java para anonymous complex type. * - * <p>Le fragment de schéma suivant indique le contenu attendu figurant dans cette classe. + * <p>El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. * * <pre> * &lt;complexType&gt; @@ -41,7 +41,7 @@ public class NumberToWords { protected BigInteger ubiNum; /** - * Obtient la valeur de la propriété ubiNum. + * Obtiene el valor de la propiedad ubiNum. * * @return * possible object is @@ -53,7 +53,7 @@ public class NumberToWords { } /** - * Définit la valeur de la propriété ubiNum. + * Define el valor de la propiedad ubiNum. * * @param value * allowed object is diff --git a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToWordsResponse.java b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToWordsResponse.java old mode 100755 new mode 100644 index 26bf8ce..a0c12ff --- a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToWordsResponse.java +++ b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/NumberToWordsResponse.java @@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType; /** - * <p>Classe Java pour anonymous complex type. + * <p>Clase Java para anonymous complex type. * - * <p>Le fragment de schéma suivant indique le contenu attendu figurant dans cette classe. + * <p>El siguiente fragmento de esquema especifica el contenido que se espera que haya en esta clase. * * <pre> * &lt;complexType&gt; @@ -38,7 +38,7 @@ public class NumberToWordsResponse { protected String numberToWordsResult; /** - * Obtient la valeur de la propriété numberToWordsResult. + * Obtiene el valor de la propiedad numberToWordsResult. * * @return * possible object is @@ -50,7 +50,7 @@ public class NumberToWordsResponse { } /** - * Définit la valeur de la propriété numberToWordsResult. + * Define el valor de la propiedad numberToWordsResult. * * @param value * allowed object is diff --git a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/ObjectFactory.java b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/ObjectFactory.java old mode 100755 new mode 100644 diff --git a/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/package-info.java b/NumberConversion/target/generated-sources/cxf/fr/insa/soap/wsdltojava/package-info.java old mode 100755 new mode 100644 diff --git a/RestProject/.classpath b/RestProject/.classpath index 3122b27..7a9a105 100755 --- a/RestProject/.classpath +++ b/RestProject/.classpath @@ -34,7 +34,6 @@ - diff --git a/RestProject/target/classes/fr/insa/rest/RestProject/Binome.class b/RestProject/target/classes/fr/insa/rest/RestProject/Binome.class old mode 100755 new mode 100644 diff --git a/RestProject/target/classes/fr/insa/rest/RestProject/Comparator.class b/RestProject/target/classes/fr/insa/rest/RestProject/Comparator.class old mode 100755 new mode 100644 diff --git a/RestProject/target/classes/fr/insa/rest/RestProject/Etudiant.class b/RestProject/target/classes/fr/insa/rest/RestProject/Etudiant.class old mode 100755 new mode 100644 diff --git a/RestProject/target/classes/fr/insa/rest/RestProject/EtudiantRessource.class b/RestProject/target/classes/fr/insa/rest/RestProject/EtudiantRessource.class old mode 100755 new mode 100644 diff --git a/RestProject/target/classes/fr/insa/rest/RestProject/Link.class b/RestProject/target/classes/fr/insa/rest/RestProject/Link.class old mode 100755 new mode 100644 diff --git a/RestProject/target/classes/fr/insa/rest/RestProject/MyResource.class b/RestProject/target/classes/fr/insa/rest/RestProject/MyResource.class old mode 100755 new mode 100644 diff --git a/RestProject/target/classes/fr/insa/rest/RestProject/Stage.class b/RestProject/target/classes/fr/insa/rest/RestProject/Stage.class old mode 100755 new mode 100644 diff --git a/RestProject/target/classes/fr/insa/rest/RestProject/StageRessource.class b/RestProject/target/classes/fr/insa/rest/RestProject/StageRessource.class old mode 100755 new mode 100644 diff --git a/TestRest/.classpath b/TestRest/.classpath index 3122b27..7a9a105 100755 --- a/TestRest/.classpath +++ b/TestRest/.classpath @@ -34,7 +34,6 @@ - diff --git a/TestRest/.gitignore b/TestRest/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/TestRest/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/TestRest/target/classes/fr/insa/rest/TestRest/ClientRest.class b/TestRest/target/classes/fr/insa/rest/TestRest/ClientRest.class old mode 100755 new mode 100644 diff --git a/taskCreator/src/main/java/fr/insa/mas/taskCreator/controller/taskRessource.java b/taskCreator/src/main/java/fr/insa/mas/taskCreator/controller/taskRessource.java index a27ee38..25af718 100644 --- a/taskCreator/src/main/java/fr/insa/mas/taskCreator/controller/taskRessource.java +++ b/taskCreator/src/main/java/fr/insa/mas/taskCreator/controller/taskRessource.java @@ -1,5 +1,31 @@ package fr.insa.mas.taskCreator.controller; -public class taskRessource { +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import fr.insa.mas.taskCreator.model.task; + + + +@RestController +@RequestMapping("task") + + +public class taskRessource { + + @PostMapping("propose/{condition}/{approval}/{assignedAdmin}/{assignedHelper}/{assignedRequester}/{Description}") + public void addTask(@PathVariable("condition") Boolean condition, , @PathVariable("approval") Boolean approval , @PathVariable("assignedAdmin") int User.id, @PathVariable("assignedHelper") int User.id, @PathVariable("assignedRequester") int User, @PathVariable("assignedRequester") String Description) { + task.saveTask(false, false, Null, id, Null, Description); + } + + + @PostMapping("request/{condition}/{approval}/{assignedAdmin}/{assignedHelper}/{assignedRequester}/{Description}") + public void propTask(@PathVariable("condition") Boolean condition, , @PathVariable("approval") Boolean approval , @PathVariable("assignedAdmin") int User.id, @PathVariable("assignedHelper") int User.id, @PathVariable("assignedRequester") int User, @PathVariable("assignedRequester") String Description) { + task.saveTask(false, false, Null, id, Null, Description); + } + + -} diff --git a/taskCreator/src/main/java/fr/insa/mas/taskCreator/model/task.java b/taskCreator/src/main/java/fr/insa/mas/taskCreator/model/task.java index 218d63d..dcb85c0 100644 --- a/taskCreator/src/main/java/fr/insa/mas/taskCreator/model/task.java +++ b/taskCreator/src/main/java/fr/insa/mas/taskCreator/model/task.java @@ -48,16 +48,16 @@ public class task { task task = new task(id, condition, approval, assignedAdmin, assignedHelper, assignedRequester, Description); try { Statement statement = (Statement) task.connection.createStatement(); - statement.addBatch("INSERT INTO task"); + statement.addBatch("INSERT INTO task (id, approved, assignedAdmin, helper, helped, description, isCompleted) VALUES ("+ id +", \"" + task.approval + "\",\"" + task.assignedAdmin + "\",\"" + task.assignedHelper + "\"," + task.assignedRequester +"\", " + task.Description + " );"); statement.executeBatch(); statement.close(); }catch(SQLException e){ throw new RuntimeException(e); - } - - + } } + + public int getId() { return id; }