Author: qmoriceau Date: 2013-06-07 17:01:05 +0200 (Fri, 07 Jun 2013) New Revision: 40 Url: http://chorem.org/projects/incubator/repository/revisions/40 Log: Appel directe au services m?\195?\169tiers et remplacement des tabulations par des espaces. Removed: jtimerhtml5/src/main/java/org/chorem/jtimer/TaskService.java Modified: jtimerhtml5/src/main/java/org/chorem/jtimer/JTimer.java jtimerhtml5/src/main/java/org/chorem/jtimer/JTimerHandler.java jtimerhtml5/src/main/java/org/chorem/jtimer/TaskExclusionStrategy.java jtimerhtml5/src/main/java/org/chorem/jtimer/WebViewJTimer.java jtimerhtml5/src/main/java/org/chorem/jtimer/storage/Storage.java jtimerhtml5/src/main/resources/html/js/actionsMenus.js Modified: jtimerhtml5/src/main/java/org/chorem/jtimer/JTimer.java =================================================================== --- jtimerhtml5/src/main/java/org/chorem/jtimer/JTimer.java 2013-06-06 09:00:25 UTC (rev 39) +++ jtimerhtml5/src/main/java/org/chorem/jtimer/JTimer.java 2013-06-07 15:01:05 UTC (rev 40) @@ -11,10 +11,10 @@ public class JTimer extends WebViewJTimer { public static void main(String[] args) throws Exception { - - Server server = new Server(8080); - - ResourceHandler resource_handler = new ResourceHandler(); + + Server server = new Server(8080); + + ResourceHandler resource_handler = new ResourceHandler(); resource_handler.setDirectoriesListed(true); resource_handler.setWelcomeFiles(new String[]{ "index.html" }); @@ -24,13 +24,13 @@ handlers.setHandlers(new Handler[] { resource_handler , new JTimerHandler()}); server.setHandler(handlers); - server.start(); - URI uri = new URI("http://localhost:8080"); - try{ - Desktop.getDesktop().browse(uri); // permet de lancer la page dans le nivigateur par défault - } catch (Exception e) { - launch(args);// permer de lancer la page dans la web view si le navigateur n'est pas trouvé - } - server.join(); + server.start(); + URI uri = new URI("http://localhost:8080"); + try{ + Desktop.getDesktop().browse(uri); // permet de lancer la page dans le nivigateur par défault + } catch (Exception e) { + launch(args);// permer de lancer la page dans la web view si le navigateur n'est pas trouvé + } + server.join(); } } Modified: jtimerhtml5/src/main/java/org/chorem/jtimer/JTimerHandler.java =================================================================== --- jtimerhtml5/src/main/java/org/chorem/jtimer/JTimerHandler.java 2013-06-06 09:00:25 UTC (rev 39) +++ jtimerhtml5/src/main/java/org/chorem/jtimer/JTimerHandler.java 2013-06-07 15:01:05 UTC (rev 40) @@ -9,7 +9,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; +import org.chorem.jtimer.storage.Storage; import org.eclipse.jetty.server.HttpConnection; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.handler.AbstractHandler; @@ -21,49 +23,58 @@ public class JTimerHandler extends AbstractHandler { - @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - - final String[] path = request.getRequestURI().split("/"); - - if (path[1].equals("task")){ - - final TaskService ts = new TaskService(); - String content = new String(); - Object result; - ExclusionStrategy excludeTasks = new TaskExclusionStrategy(TimerTask.class); - Gson gson = new GsonBuilder().setExclusionStrategies(excludeTasks).create(); + final Storage storage = new Storage(); + + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException { + + final String[] path = request.getRequestURI().split("/"); + + if (path[1].equals("task") || path[1].equals("project") || path[1].equals("other")){ + + String content = new String(); + Object result; + ExclusionStrategy excludeTasks = new TaskExclusionStrategy(TimerTask.class); + Gson gson = new GsonBuilder().setExclusionStrategies(excludeTasks).create(); - String[] param = new String[path.length-3]; - for(int i=0;i<path.length-3;i++){ - param[i]=path[i+3]; - } - List<Method> m = ObjectUtil.getMethod(TaskService.class,path[2],false); - try { - result = ObjectUtil.call(ts, m.get(0), param); - content = gson.toJson(result); - System.out.println(content); - } catch (IllegalAccessException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IllegalArgumentException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (InvocationTargetException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (InstantiationException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - response.setContentType("text/json;charset=utf-8"); - response.setStatus(HttpServletResponse.SC_OK); - response.getOutputStream().print(content); - - Request base_request = (Request) ((request instanceof Request) ? (Request)request:HttpConnection.getCurrentConnection().getRequestBuffer()); - base_request.setHandled(true); - } - } + String[] param = new String[path.length-3]; + for(int i=0;i<path.length-3;i++){ + param[i]=path[i+3]; + } + /*if(path[1].equals("task")){ // test de transformation json to java + param[0] = gson.fromJson(param[0], TimerTask.class); + } + else if(path[1].equals("project")){ + param[0] = gson.fromJson(param[0], TimerProject.class); + }*/ + List<Method> m = ObjectUtil.getMethod(Storage.class,path[2],false); + try { + result = ObjectUtil.call(storage, m.get(0), param); + content = gson.toJson(result); + } catch (IllegalAccessException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IllegalArgumentException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (InvocationTargetException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (InstantiationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + + response.setContentType("text/json;charset=utf-8"); + response.setStatus(HttpServletResponse.SC_OK); + response.getOutputStream().print(content); + + // la requête est réglé, on fait en sorte qu'il ne passe pas dans un autre handler + Request base_request = (Request) ((request instanceof Request) ? (Request)request:HttpConnection.getCurrentConnection().getRequestBuffer()); + base_request.setHandled(true); + } + } + } Modified: jtimerhtml5/src/main/java/org/chorem/jtimer/TaskExclusionStrategy.java =================================================================== --- jtimerhtml5/src/main/java/org/chorem/jtimer/TaskExclusionStrategy.java 2013-06-06 09:00:25 UTC (rev 39) +++ jtimerhtml5/src/main/java/org/chorem/jtimer/TaskExclusionStrategy.java 2013-06-07 15:01:05 UTC (rev 40) @@ -5,23 +5,23 @@ public class TaskExclusionStrategy implements ExclusionStrategy { - - private final Class<?> excludedThisClass; + + private final Class<?> excludedThisClass; - public TaskExclusionStrategy(Class<?> excludedThisClass) { - this.excludedThisClass = excludedThisClass; - } - - @Override - public boolean shouldSkipClass(Class<?> clas_s) { - // TODO Auto-generated method stub - return false; - } + public TaskExclusionStrategy(Class<?> excludedThisClass) { + this.excludedThisClass = excludedThisClass; + } + + @Override + public boolean shouldSkipClass(Class<?> clas_s) { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean shouldSkipField(FieldAttributes fieldAttributes) { - // TODO Auto-generated method stub - return ((fieldAttributes.getDeclaringClass()==excludedThisClass && fieldAttributes.getName().equals("parent")) || (fieldAttributes.getDeclaringClass()==excludedThisClass && fieldAttributes.getName().equals("subTasks"))); - } + @Override + public boolean shouldSkipField(FieldAttributes fieldAttributes) { + // TODO Auto-generated method stub + return ((fieldAttributes.getDeclaringClass()==excludedThisClass && fieldAttributes.getName().equals("parent")) || (fieldAttributes.getDeclaringClass()==excludedThisClass && fieldAttributes.getName().equals("subTasks"))); + } } \ No newline at end of file Deleted: jtimerhtml5/src/main/java/org/chorem/jtimer/TaskService.java =================================================================== --- jtimerhtml5/src/main/java/org/chorem/jtimer/TaskService.java 2013-06-06 09:00:25 UTC (rev 39) +++ jtimerhtml5/src/main/java/org/chorem/jtimer/TaskService.java 2013-06-07 15:01:05 UTC (rev 40) @@ -1,81 +0,0 @@ -package org.chorem.jtimer; - -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.chorem.jtimer.entities.TimerTask; - -public class TaskService { - - public List<TimerTask> getProjects(){ - List<TimerTask> listT = new ArrayList<TimerTask>(); - listT.add(new TimerTask("salut salut")); - listT.add(new TimerTask("comment va ?")); - listT.add(new TimerTask("comme un mercredi")); - return (listT); - } - - public void addProject(String name){ - System.out.println("newProject call"); - } - - public String modifyProject(int idProject, String newName) throws UnsupportedEncodingException{ - return ("Nouveau nom du projet "+idProject+" est : "+URLDecoder.decode(newName, "UTF-8")); - } - - public void ofProject(int idProject){ - - } - - public void deleteProject(int idProject){ - - } - - public void addTask(String name){ - - } - - public void ofTask(int idTask){ - - } - - public void deleteTask(int idTask){ - - } - - public String startTask(int idTask){ - return("{\"task\":[{\"pre\":\"comment ça va ?\",\"suf\":\"comme un vendredi\"}]}"); - } - - public void stopTask(int idTask){ - - } - - public void setAnnotation(int idTask, String note){// ne pas oublier la date ! - - } - - public void addsou(int idTask, int nb){ - - } - - public void zero(int idTask){ - - } - - /*public void fusion(List<Task> tasks){ - - }*/ - - public void systray(boolean bool){ //vraiment besoin du booléen ? - - } - - public void dStartWeek(int day){ - - } - -} Modified: jtimerhtml5/src/main/java/org/chorem/jtimer/WebViewJTimer.java =================================================================== --- jtimerhtml5/src/main/java/org/chorem/jtimer/WebViewJTimer.java 2013-06-06 09:00:25 UTC (rev 39) +++ jtimerhtml5/src/main/java/org/chorem/jtimer/WebViewJTimer.java 2013-06-07 15:01:05 UTC (rev 40) @@ -30,11 +30,11 @@ import javafx.util.Callback; public class WebViewJTimer extends Application { - - @Override - public void start(final Stage stage) { - - stage.setTitle("jTimer"); + + @Override + public void start(final Stage stage) { + + stage.setTitle("jTimer"); Scene scene = new Scene(new Group(), 460, 510); @@ -44,68 +44,68 @@ final WebEngine webEngine = browser.getEngine(); // les différentes initialisation nécéssaire aux boites de dialogue - final VBox confirmationResults = new VBox(); - confirmationResults.getStyleClass().add("confirmation-results"); - confirmationResults.setMinWidth(100); - HBox layout = new HBox(); - layout.getChildren().addAll(confirmationResults, browser); - stage.setScene(new Scene(layout)); - stage.show(); - stage.getScene().getStylesheets().add(getClass().getResource("/cssJavaFX/alert_box.css").toExternalForm()); + final VBox confirmationResults = new VBox(); + confirmationResults.getStyleClass().add("confirmation-results"); + confirmationResults.setMinWidth(100); + HBox layout = new HBox(); + layout.getChildren().addAll(confirmationResults, browser); + stage.setScene(new Scene(layout)); + stage.show(); + stage.getScene().getStylesheets().add(getClass().getResource("/cssJavaFX/alert_box.css").toExternalForm()); // permet d'ouvrir des popup. webEngine.setCreatePopupHandler(new Callback<PopupFeatures, WebEngine>() { - public WebEngine call(PopupFeatures popupFeatures) { - final WebView popupWebView = new WebView(); - final Scene popupScene = new Scene(popupWebView); - final Stage popupStage = new Stage(); - popupStage.setScene(popupScene); - popupStage.setResizable(popupFeatures.isResizable()); - popupStage.show(); - - WebEngine popupEngine = popupWebView.getEngine(); - - popupEngine.setOnVisibilityChanged( new EventHandler<WebEvent<Boolean>>() { - public void handle(WebEvent<Boolean> we) { - if (!we.getData()){ - popupStage.close(); - } - } - }); + public WebEngine call(PopupFeatures popupFeatures) { + final WebView popupWebView = new WebView(); + final Scene popupScene = new Scene(popupWebView); + final Stage popupStage = new Stage(); + popupStage.setScene(popupScene); + popupStage.setResizable(popupFeatures.isResizable()); + popupStage.show(); - return popupEngine; - } - }); + WebEngine popupEngine = popupWebView.getEngine(); + + popupEngine.setOnVisibilityChanged( new EventHandler<WebEvent<Boolean>>() { + public void handle(WebEvent<Boolean> we) { + if (!we.getData()){ + popupStage.close(); + } + } + }); + + return popupEngine; + } + }); // permet de fermer la fenêtre webEngine.setOnVisibilityChanged( new EventHandler<WebEvent<Boolean>>() { - public void handle(WebEvent<Boolean> we) { - if (!we.getData()){ - stage.close(); - } - } - }); + public void handle(WebEvent<Boolean> we) { + if (!we.getData()){ + stage.close(); + } + } + }); webEngine.setOnAlert(new EventHandler<WebEvent<String>>(){ @Override public void handle(WebEvent<String> we) { - alert(stage, we.getData()); + alert(stage, we.getData()); } }); webEngine.setConfirmHandler(new Callback<String, Boolean>(){ - public Boolean call(String str){ - Boolean confirmed = confirm(stage, str); - confirmationResults.getChildren().add(new Label("Confirmed? " + confirmed)); - return confirmed; - } + public Boolean call(String str){ + Boolean confirmed = confirm(stage, str); + confirmationResults.getChildren().add(new Label("Confirmed? " + confirmed)); + return confirmed; + } }); webEngine.setPromptHandler(new Callback<PromptData, String>(){ - public String call(PromptData pdata){ - String result = prompt(stage, pdata.getMessage(), pdata.getDefaultValue()); - return result; - } + public String call(PromptData pdata){ + String result = prompt(stage, pdata.getMessage(), pdata.getDefaultValue()); + return result; + } }); webEngine.load("http://localhost:8080"); @@ -122,141 +122,141 @@ // boite de dialogue de question ouverte private String prompt(final Stage parent, String msg, String dft) { - - final StringProperty reponse = new SimpleStringProperty(); - final Stage dialog = new Stage(StageStyle.TRANSPARENT); - dialog.initOwner(parent); - dialog.initModality(Modality.WINDOW_MODAL); - - Label label = new Label(msg); - final TextField textField = new TextField(dft); - Button buttonOk = new Button("OK"); - Button buttonCancel = new Button("Annuler"); - - Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,textField,buttonOk,buttonCancel).build(), Color.TRANSPARENT); - dialog.setScene(scn); - - buttonOk.setOnAction(new EventHandler<ActionEvent>() { - @Override - public void handle(ActionEvent arg0) { - reponse.setValue(textField.getCharacters().toString()); - parent.getScene().getRoot().setEffect(null); - dialog.close(); - } - }); - - buttonCancel.setOnAction(new EventHandler<ActionEvent>() { - @Override - public void handle(ActionEvent arg0) { - reponse.setValue(null); - parent.getScene().getRoot().setEffect(null); - dialog.close(); - } - }); + + final StringProperty reponse = new SimpleStringProperty(); + final Stage dialog = new Stage(StageStyle.TRANSPARENT); + dialog.initOwner(parent); + dialog.initModality(Modality.WINDOW_MODAL); + + Label label = new Label(msg); + final TextField textField = new TextField(dft); + Button buttonOk = new Button("OK"); + Button buttonCancel = new Button("Annuler"); + + Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,textField,buttonOk,buttonCancel).build(), Color.TRANSPARENT); + dialog.setScene(scn); + + buttonOk.setOnAction(new EventHandler<ActionEvent>() { + @Override + public void handle(ActionEvent arg0) { + reponse.setValue(textField.getCharacters().toString()); + parent.getScene().getRoot().setEffect(null); + dialog.close(); + } + }); + + buttonCancel.setOnAction(new EventHandler<ActionEvent>() { + @Override + public void handle(ActionEvent arg0) { + reponse.setValue(null); + parent.getScene().getRoot().setEffect(null); + dialog.close(); + } + }); - dragged(dialog); + dragged(dialog); - // style and show the dialog. - dialog.getScene().getStylesheets().add(getClass().getResource("/cssJavaFX/prompt_box.css").toExternalForm()); - parent.getScene().getRoot().setEffect(new BoxBlur()); - dialog.showAndWait(); - - return reponse.get(); - } + // style and show the dialog. + dialog.getScene().getStylesheets().add(getClass().getResource("/cssJavaFX/prompt_box.css").toExternalForm()); + parent.getScene().getRoot().setEffect(new BoxBlur()); + dialog.showAndWait(); + + return reponse.get(); + } - // boite de dialogue d'alerte + // boite de dialogue d'alerte private void alert(final Stage parent, String msg) { - // initialize the alert dialog - final Stage dialog = new Stage(StageStyle.TRANSPARENT); - dialog.initOwner(parent); - dialog.initModality(Modality.WINDOW_MODAL); - - Label label = new Label(msg); - Button buttonOk = new Button("OK"); - - Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,buttonOk).build(), Color.TRANSPARENT); - dialog.setScene(scn); - - buttonOk.setOnAction(new EventHandler<ActionEvent>() { - @Override - public void handle(ActionEvent arg0) { - parent.getScene().getRoot().setEffect(null); - dialog.close(); - } - }); + // initialize the alert dialog + final Stage dialog = new Stage(StageStyle.TRANSPARENT); + dialog.initOwner(parent); + dialog.initModality(Modality.WINDOW_MODAL); + + Label label = new Label(msg); + Button buttonOk = new Button("OK"); + + Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,buttonOk).build(), Color.TRANSPARENT); + dialog.setScene(scn); + + buttonOk.setOnAction(new EventHandler<ActionEvent>() { + @Override + public void handle(ActionEvent arg0) { + parent.getScene().getRoot().setEffect(null); + dialog.close(); + } + }); - dragged(dialog); + dragged(dialog); - // style and show the dialog. - dialog.getScene().getStylesheets().add(getClass().getResource("/cssJavaFX/alert_box.css").toExternalForm()); - parent.getScene().getRoot().setEffect(new BoxBlur()); - dialog.showAndWait(); - } + // style and show the dialog. + dialog.getScene().getStylesheets().add(getClass().getResource("/cssJavaFX/alert_box.css").toExternalForm()); + parent.getScene().getRoot().setEffect(new BoxBlur()); + dialog.showAndWait(); + } // boite de dialogue de confirmation private Boolean confirm(final Stage parent, String msg) { - final BooleanProperty confirmationResult = new SimpleBooleanProperty(); - // initialize the confirmation dialog - final Stage dialog = new Stage(StageStyle.TRANSPARENT); - dialog.initOwner(parent); - dialog.initModality(Modality.WINDOW_MODAL); - - Label label = new Label(msg); - Button buttonOk = new Button("OK"); - Button buttonCancel = new Button("Annuler"); - - Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,buttonOk,buttonCancel).build(), Color.TRANSPARENT); - dialog.setScene(scn); - - buttonOk.setOnAction(new EventHandler<ActionEvent>() { - @Override - public void handle(ActionEvent arg0) { - confirmationResult.set(true); - parent.getScene().getRoot().setEffect(null); - dialog.close(); - } - }); - - buttonCancel.setOnAction(new EventHandler<ActionEvent>() { - @Override - public void handle(ActionEvent arg0) { - confirmationResult.set(false); - parent.getScene().getRoot().setEffect(null); - dialog.close(); - } - }); + final BooleanProperty confirmationResult = new SimpleBooleanProperty(); + // initialize the confirmation dialog + final Stage dialog = new Stage(StageStyle.TRANSPARENT); + dialog.initOwner(parent); + dialog.initModality(Modality.WINDOW_MODAL); + + Label label = new Label(msg); + Button buttonOk = new Button("OK"); + Button buttonCancel = new Button("Annuler"); + + Scene scn = new Scene(HBoxBuilder.create().styleClass("modal-dialog").children(label,buttonOk,buttonCancel).build(), Color.TRANSPARENT); + dialog.setScene(scn); + + buttonOk.setOnAction(new EventHandler<ActionEvent>() { + @Override + public void handle(ActionEvent arg0) { + confirmationResult.set(true); + parent.getScene().getRoot().setEffect(null); + dialog.close(); + } + }); + + buttonCancel.setOnAction(new EventHandler<ActionEvent>() { + @Override + public void handle(ActionEvent arg0) { + confirmationResult.set(false); + parent.getScene().getRoot().setEffect(null); + dialog.close(); + } + }); - dragged(dialog); - + dragged(dialog); + - // style and show the dialog. - dialog.getScene().getStylesheets().add(getClass().getResource("/cssJavaFX/confirm_box.css").toExternalForm()); - parent.getScene().getRoot().setEffect(new BoxBlur()); - dialog.showAndWait(); + // style and show the dialog. + dialog.getScene().getStylesheets().add(getClass().getResource("/cssJavaFX/confirm_box.css").toExternalForm()); + parent.getScene().getRoot().setEffect(new BoxBlur()); + dialog.showAndWait(); - return confirmationResult.get(); - } + return confirmationResult.get(); + } // permet de déplacer le Stage entrer en paramètre avec la sourie. private void dragged(final Stage dialog){ - final Node root = dialog.getScene().getRoot(); - final Delta dragDelta = new Delta(); - root.setOnMousePressed(new EventHandler<MouseEvent>() { - @Override public void handle(MouseEvent mouseEvent) { - // record a delta distance for the drag and drop operation. - dragDelta.x = dialog.getX() - mouseEvent.getScreenX(); - dragDelta.y = dialog.getY() - mouseEvent.getScreenY(); - } - }); - root.setOnMouseDragged(new EventHandler<MouseEvent>() { - @Override public void handle(MouseEvent mouseEvent) { - dialog.setX(mouseEvent.getScreenX() + dragDelta.x); - dialog.setY(mouseEvent.getScreenY() + dragDelta.y); - } - }); + final Node root = dialog.getScene().getRoot(); + final Delta dragDelta = new Delta(); + root.setOnMousePressed(new EventHandler<MouseEvent>() { + @Override public void handle(MouseEvent mouseEvent) { + // record a delta distance for the drag and drop operation. + dragDelta.x = dialog.getX() - mouseEvent.getScreenX(); + dragDelta.y = dialog.getY() - mouseEvent.getScreenY(); + } + }); + root.setOnMouseDragged(new EventHandler<MouseEvent>() { + @Override public void handle(MouseEvent mouseEvent) { + dialog.setX(mouseEvent.getScreenX() + dragDelta.x); + dialog.setY(mouseEvent.getScreenY() + dragDelta.y); + } + }); } // records relative x and y co-ordinates. - class Delta { double x, y; } + class Delta { double x, y; } } Modified: jtimerhtml5/src/main/java/org/chorem/jtimer/storage/Storage.java =================================================================== --- jtimerhtml5/src/main/java/org/chorem/jtimer/storage/Storage.java 2013-06-06 09:00:25 UTC (rev 39) +++ jtimerhtml5/src/main/java/org/chorem/jtimer/storage/Storage.java 2013-06-07 15:01:05 UTC (rev 40) @@ -163,7 +163,7 @@ try { statement = conn.createStatement(); statement.executeUpdate("CREATE TABLE " + TABLE_VERSION + - "(version VARCHAR(10))"); + "(version VARCHAR(10))"); statement.executeUpdate("CREATE TABLE " + TABLE_TASK + "(id LONG NOT NULL AUTO_INCREMENT PRIMARY KEY," + " name VARCHAR(255) NOT NULL," + Modified: jtimerhtml5/src/main/resources/html/js/actionsMenus.js =================================================================== --- jtimerhtml5/src/main/resources/html/js/actionsMenus.js 2013-06-06 09:00:25 UTC (rev 39) +++ jtimerhtml5/src/main/resources/html/js/actionsMenus.js 2013-06-07 15:01:05 UTC (rev 40) @@ -2,7 +2,7 @@ var elemSelec = ""; function getTasks(){ - $.getJSON('http://localhost:8080/task/getProjects',function(data) { + $.getJSON('http://localhost:8080/other/getProjects',function(data) { for (var i = 0; i<3; i++){ tabProjects[data[i].number] = data[i]; } @@ -102,7 +102,7 @@ alert("Erreur : Le nom est vide !"); } else { - $.get('http://localhost:8080/task/addProject/'+nameNewProject,function(data){ + $.get('http://localhost:8080/other/addProject/'+nameNewProject,function(data){ alert(data); }); } @@ -115,7 +115,7 @@ alert("Erreur : Le nom est vide !"); } else { - $.get('http://localhost:8080/task/modifyProject/'+elemSelec.substring(1,elemSelec.length)+'/'+newnameProject,function(data){ + $.get('http://localhost:8080/project/modifyProject/'+elemSelec.substring(1,elemSelec.length)+'/'+newnameProject,function(data){ alert(data); }); } @@ -123,7 +123,7 @@ } function ofProject(){ - $.get('http://localhost:8080/task/ofProject/'+elemSelec.substring(1,elemSelec.length),function(data){ + $.get('http://localhost:8080/task/changeClosedState/'+elemSelec.substring(1,elemSelec.length),function(data){ alert(data); }); } @@ -131,7 +131,7 @@ function supprProject() { var bool = confirm("Voulez-vous supprimer le Projet x ?") if (bool){ - $.get('http://localhost:8080/task/deleteProject/'+elemSelec.substring(1,elemSelec.length),function(data){ + $.get('http://localhost:8080/project/deleteProject/'+elemSelec.substring(1,elemSelec.length),function(data){ alert(data); }); } @@ -155,7 +155,7 @@ } function ofTask(){ - $.get('http://localhost:8080/task/ofTask/'+elemSelec.substring(1,elemSelec.length),function(data){ + $.get('http://localhost:8080/task/changeClosedState/'+elemSelec.substring(1,elemSelec.length),function(data){ alert(data); }); } @@ -170,15 +170,12 @@ } function startTask(){ - $.getJSON('http://localhost:8080/task/startTask/1',function(data){ - var bla = data.task[0].pre; - bla = bla + " " + data.task[0].suf; - alert(bla); - }); + } function stopTask(){ - $.get('http://localhost:8080/task/stopTask/'+elemSelec.substring(1,elemSelec.length),function(data){ + + $.get('http://localhost:8080/task/saveTaskTimes/'+elemSelec.substring(1,elemSelec.length),function(data){ alert(data); }); } @@ -195,7 +192,9 @@ } function addsou(nb){ - $.get('http://localhost:8080/task/addsou/'+elemSelec.substring(1,elemSelec.length)+'/'+nb,function(data){ + + + $.get('http://localhost:8080/task/saveTaskTimes/'+elemSelec.substring(1,elemSelec.length)+'/'+nb,function(data){ alert(data); }); }