Merge remote-tracking branch 'refs/remotes/origin/main'

AnalyseClient/.gitignore

@@ -0,0 +1 @@
+/target/

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
 

AnalyseClient/target/classes/META-INF/maven/fr.insa.soap/ClientWS/pom.properties

@@ -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

AnalyseClient/target/classes/META-INF/maven/fr.insa.soap/ClientWS/pom.xml

@@ -1,52 +0,0 @@
-<project xmlns="https://maven.apache.org/POM/4.0.0"
-xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-
-4.0.0.xsd">
-<modelVersion>4.0.0</modelVersion>
-<groupId>fr.insa.soap</groupId>
-<artifactId>ClientWS</artifactId>
-<version>0.0.1-SNAPSHOT</version>
-<properties>
-<java.version>11</java.version>
-<cxf.version>3.4.2</cxf.version>
-</properties>
-<dependencies>
-<!-- https://mvnrepository.com/artifact/com.sun.xml.ws/jaxws-rt -->
-<dependency>
-<groupId>com.sun.xml.ws</groupId>
-<artifactId>jaxws-rt</artifactId>
-<version>2.3.3</version>
-</dependency>
-</dependencies>
-<build>
-<plugins>
-<plugin>
-<groupId>org.apache.cxf</groupId>
-<artifactId>cxf-codegen-plugin</artifactId>
-<version>${cxf.version}</version>
-<executions>
-<execution>
-<id>generate-sources</id>
-<phase>generate-sources</phase>
-<configuration>
-<sourceRoot>
-${project.build.directory}/generated-sources/cxf
-</sourceRoot>
-<wsdlOptions>
-<wsdlOption>
-<wsdl>${basedir}/src/main/resources/wsdl/analyzer.wsdl</wsdl>
-<packagenames>
-<packagename>fr.insa.soap.wsdltojava</packagename>
-</packagenames>
-</wsdlOption>
-</wsdlOptions>
-</configuration>
-<goals>
-<goal>wsdl2java</goal>
-</goals>
-</execution>
-</executions>
-</plugin>
-</plugins>
-</build>
-</project>

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

Benevolat/.gitignore

@@ -0,0 +1 @@
+/target/

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
 

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

NumberConversion/.gitignore

@@ -0,0 +1 @@
+/target/

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
 

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

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;
     }

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
  *
  */

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>
  * <complexType>
@@ -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

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>
  * <complexType>
@@ -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

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>
  * <complexType>
@@ -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

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>
  * <complexType>
@@ -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

RestProject/.classpath

@@ -34,7 +34,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

TestRest/.classpath

@@ -34,7 +34,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

TestRest/.gitignore

@@ -0,0 +1 @@
+/target/

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);
+	}
+	
+	
 
-}

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;
 	}