r441 - in trunk: . chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports chorem-webmotion/src/main/webapp/js - Chorem-commits

20 Oct 2014

Author: jcouteau
Date: 2014-10-20 10:58:25 +0200 (Mon, 20 Oct 2014)
New Revision: 441

Url: http://forge.chorem.org/projects/chorem/repository/revisions/441

Log:
Update versions and fix sales funnel (changes after version updates)


Modified:
   trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java
   trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp
   trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js
   trunk/pom.xml

Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java
===================================================================

--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java	2014-10-17 16:05:55 UTC (rev 440)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java	2014-10-20 08:58:25 UTC (rev 441)
@@ -87,7 +87,7 @@
             getContext().addInfoMessage("message", "Warning: Could not parse date " + rejectedDate);
         }
         client.store(rejected);
-        return new RenderWikitty().setModelWikitty((Wikitty) rejected);
+        return new RenderWikittyJson(rejected);
     }
 
     public Render start(ChoremClient client, String id) {

Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp	2014-10-17 16:05:55 UTC (rev 440)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp	2014-10-20 08:58:25 UTC (rev 441)
@@ -28,7 +28,7 @@
 <head>
   <link rel="stylesheet/less" href="<c:url value='/css/chorem-sales.css'/>">
   <script type="text/javascript" src="<c:url value='/js/salesFunnel.js'/>"></script>
-  <script type="text/javascript" src="http://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.5.0.js"></script>
+  <script type="text/javascript" src="http://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.11.2.js"></script>
   <script type="text/javascript" src="https://raw.github.com/angular-ui/ui-date/master/src/date.js"></script>
 </head>
 

Modified: trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js	2014-10-17 16:05:55 UTC (rev 440)
+++ trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js	2014-10-20 08:58:25 UTC (rev 441)
@@ -41,7 +41,7 @@
 });
 
 
-var salesFunnelController = ['$scope', '$dialog', 'Wikitty', function ($scope, $dialog, Wikitty) {
+var salesFunnelController = ['$scope', '$modal', 'Wikitty', function ($scope, $modal, Wikitty) {
     $scope.wikittyId = '';
     $scope.wikitty = {};
 
@@ -68,7 +68,7 @@
     });
 
     $scope.leadToDraft = function(lead){
-        var d = $dialog.dialog({
+        var d = $modal.open({
             templateUrl: './funnel/partial/dialog-leadToDraft.html',
             controller: 'LeadToDraftDialogController',
             resolve: {
@@ -77,12 +77,10 @@
                 }
             }
         });
-        d.open();
-        //initFields();
     };
 
     $scope.draftToSent = function(draft){
-        var d = $dialog.dialog({
+        var d = $modal.open({
             templateUrl: './funnel/partial/dialog-draftToSent.html',
             controller: 'DraftToSentDialogController',
             resolve: {
@@ -91,11 +89,10 @@
                 }
             }
         });
-        d.open();
     };
 
     $scope.sentToAccepted = function(sent){
-        var d = $dialog.dialog({
+        var d = $modal.open({
             templateUrl: './funnel/partial/dialog-sentToAccepted.html',
             controller: 'SentToAcceptedDialogController',
             resolve: {
@@ -104,11 +101,10 @@
                 }
             }
         });
-        d.open();
     };
 
     $scope.sentToRejected = function(sent){
-        var d = $dialog.dialog({
+        var d = $modal.open({
             templateUrl: './funnel/partial/dialog-sentToRejected.html',
             controller: 'SentToRejectedDialogController',
             resolve: {
@@ -117,11 +113,10 @@
                 }
             }
         });
-        d.open();
     };
 
     $scope.cancel = function(toCancel){
-        var d = $dialog.dialog({
+        var d = $modal.open({
             templateUrl: './funnel/partial/dialog-cancel.html',
             controller: 'CancelDialogController',
             resolve: {
@@ -130,21 +125,20 @@
                 }
             }
         });
-        d.open();
     };
 }];
 
 
 
 // Controller for the Lead To Draft Dialog
-var LeadToDraftDialogController = ['$scope', '$http', 'dialog', 'dialogModel', 'Wikitty', function ($scope, $http, dialog, dialogModel, Wikitty) {
+var LeadToDraftDialogController = ['$scope', '$http', '$modalInstance', 'dialogModel', 'Wikitty', function ($scope, $http, $modalInstance, dialogModel, Wikitty) {
   $scope.lead = dialogModel.lead;
   $scope.drafts = dialogModel.drafts;
   $scope.leads = dialogModel.leads;
   //$scope.lead.sendingDate = new Date().toString("dd/mm/yy");
 
   $scope.cancel = function(){
-    dialog.close();
+    $modalInstance.close();
   };
 
   $scope.validate = function(){
@@ -155,7 +149,7 @@
       function(data,status){
         scope.drafts.push(new Wikitty(data));
         scope.leads.splice(scope.leads.indexOf(scope.lead),1);
-        dialog.close();
+        $modalInstance.close();
       }
     );
   }
@@ -164,14 +158,14 @@
 
 
 // Controller for the Draft To Sent Dialog
-var DraftToSentDialogController = ['$scope', '$http', 'dialog', 'dialogModel', 'Wikitty', function ($scope, $http, dialog, dialogModel, Wikitty) {
+var DraftToSentDialogController = ['$scope', '$http', '$modalInstance', 'dialogModel', 'Wikitty', function ($scope, $http, $modalInstance, dialogModel, Wikitty) {
   $scope.draft = dialogModel.draft;
   $scope.drafts = dialogModel.drafts;
   $scope.sents = dialogModel.sents;
   //$scope.draft.sendingDate = new Date().toString("dd/mm/yy");
 
   $scope.cancel = function(){
-    dialog.close();
+    $modalInstance.close();
   };
 
   $scope.validate = function(){
@@ -182,7 +176,7 @@
       function(data,status){
         scope.sents.push(new Wikitty(data));
         scope.drafts.splice(scope.drafts.indexOf(scope.draft),1);
-        dialog.close();
+        $modalInstance.close();
       }
     );
   }
@@ -191,13 +185,13 @@
 
 
 // Controller for the Sent to Accepted Dialog
-var SentToAcceptedDialogController = ['$scope', '$http', 'dialog', 'dialogModel', function ($scope, $http, dialog, dialogModel) {
+var SentToAcceptedDialogController = ['$scope', '$http', '$modalInstance', 'dialogModel', function ($scope, $http, $modalInstance, dialogModel) {
   $scope.sent = dialogModel.sent;
   $scope.sents = dialogModel.sents;
   $scope.sent.acceptedDate = new Date();
 
   $scope.cancel = function(){
-    dialog.close();
+    $modalInstance.close();
   };
 
   $scope.validate = function(){
@@ -207,7 +201,7 @@
     {params: {acceptedDate:$scope.sent.acceptedDate}}).success(
       function(data,status){
         $scope.sents.splice($scope.sents.indexOf(sent),1);
-        dialog.close();
+        $modalInstance.close();
       }
     );
   }
@@ -216,13 +210,13 @@
 
 
 // Controller for the Sent to Rejected Dialog
-var SentToRejectedDialogController = ['$scope', '$http', 'dialog', 'dialogModel', function ($scope, $http, dialog, dialogModel) {
+var SentToRejectedDialogController = ['$scope', '$http', '$modalInstance', 'dialogModel', function ($scope, $http, $modalInstance, dialogModel) {
   $scope.sent = dialogModel.sent;
   $scope.sents = dialogModel.sents;
   $scope.sent.rejectedDate = new Date();
 
   $scope.cancel = function(){
-    dialog.close();
+    $modalInstance.close();
   };
 
   $scope.validate = function(){
@@ -231,7 +225,7 @@
     $http.get(createUrl('sales/funnel/json/reject/'+$scope.sent.meta.id),{params: {rejectedDate:$scope.sent.rejectedDate}}).success(
       function(data,status){
         $scope.sents.splice($scope.sents.indexOf(sent),1);
-        dialog.close();
+        $modalInstance.close();
       }
     );
   }
@@ -240,20 +234,20 @@
 
 
 // Controller for the Cancel Dialog
-var CancelDialogController = ['$scope', '$http', 'dialog', 'dialogModel', function ($scope, $http, dialog, dialogModel) {
+var CancelDialogController = ['$scope', '$http', '$modalInstance', 'dialogModel', function ($scope, $http, $modalInstance, dialogModel) {
   $scope.toCancel = dialogModel.toCancel;
   $scope.sents = dialogModel.sents;
   $scope.leads = dialogModel.leads;
   $scope.drafts = dialogModel.drafts;
 
   $scope.cancel = function(){
-    dialog.close();
+    $modalInstance.close();
   };
 
   $scope.validate = function(){
     //pass scope to the success function
     var scope = $scope;
-    $http.get(createUrl('sales/funnel/json/cancel/'+$scope.toCancel.meta.id),{params: {cancelledDate:$scope.toCancel.cancelledDate, reason:$scope.toCancel.reason}}).success(
+    $http.get(createUrl('sales/funnel/json/cancel/'+$scope.toCancel.meta.id),{params: {cancelledDate:$scope.toCancel.cancelledDate, reason:$scope.toCancel.cancelledReason}}).success(
       function(data,status){
         if ($scope.sents.indexOf($scope.toCancel)!= -1) {
           $scope.sents.splice($scope.sents.indexOf($scope.toCancel),1);
@@ -265,7 +259,7 @@
           $scope.leads.splice($scope.leads.indexOf($scope.toCancel),1);
         }
 
-        dialog.close();
+       $modalInstance.close();
       }
     );
   }

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2014-10-17 16:05:55 UTC (rev 440)
+++ trunk/pom.xml	2014-10-20 08:58:25 UTC (rev 441)
@@ -59,6 +59,18 @@
         <role>developer</role>
       </roles>
     </developer>
+
+    <developer>
+      <id>jcouteau</id>
+      <name>Jean Couteau</name>
+      <email>couteau at codelutin.com</email>
+      <organization>CodeLutin</organization>
+      <organizationUrl>http://www.codelutin.com/</organizationUrl>
+      <timezone>Europe/Paris</timezone>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
   </developers>
 
   <modules>
@@ -97,18 +109,18 @@
     <processPluginVersion>1.1</processPluginVersion>
     <eugenePluginVersion>2.7.4</eugenePluginVersion>
 
-    <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion>
-    <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion>
-    <nuitonI18nVersion>3.1</nuitonI18nVersion>
-    <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion>
+    <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion>
+    <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion>
+    <nuitonI18nVersion>3.3</nuitonI18nVersion>
+    <nuitonConfigVersion>3.0-rc-2</nuitonConfigVersion>
     <nuitonWebVersion>1.16</nuitonWebVersion>
     <wikittyVersion>3.11-SNAPSHOT</wikittyVersion>
 
     <nuitonjsWro.version>1.0.3</nuitonjsWro.version>
-    <nuitonjsAngularjs.version>1.2.12-1</nuitonjsAngularjs.version>
+    <nuitonjsAngularjs.version>1.3.0-beta.7-1</nuitonjsAngularjs.version>
     <nuitonjsJquery.version>2.1.1-1</nuitonjsJquery.version>
-    <nuitonjsJqueryui.version>1.10.4-1</nuitonjsJqueryui.version>
-    <nuitonjsJqplot.version>1.0.8r1250-1-SNAPSHOT</nuitonjsJqplot.version>
+    <nuitonjsJqueryui.version>1.11.2-1</nuitonjsJqueryui.version>
+    <nuitonjsJqplot.version>1.0.8r1250-1</nuitonjsJqplot.version>
     <nuitonjsBootstrap.version>3.2.0-1</nuitonjsBootstrap.version>
 
     <!-- license to use  -->

    

r441 - in trunk: . chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports chorem-webmotion/src/main/webapp/js

jcouteau＠users.chorem.org

tags

participants (1)