Merge pull request #16 from Interactive2017/uploadPackage

Upload package

Author: Sijoma

client/app/creationProcess/uibindings.controller.js

@@ -26,6 +26,8 @@
         $scope.widgetModel = {};
         $scope.widgetModel.type = "slider";
 
+        vm.tsType;
+
         logger.info('UploadPackageCtrl with params:', $stateParams);
 
         /////
@@ -37,6 +39,12 @@
             logger.info('updated ', attr);
           } else {
             vm.required[attr] = val;
+            if (attr == "figure_type" && val == "timeseries") {
+                vm.tsType = true;
+            }
+            if (attr == "figure_type" && val == "map") {
+                vm.tsType = false;
+            }
             logger.info('updated ', attr);
           }
         };
@@ -54,11 +62,13 @@
                 var reqData = vm.required;
                 vm.packageData.figure_id = reqData.figure_id;
                 vm.packageData.type = reqData.figure_type;
-                vm.packageData.endpoint = reqData.figure_endpoint;
-                vm.packageData.x_axis_label = reqData.x_axis_label;
-                vm.packageData.y_axis_label = reqData.y_axis_label;
-                vm.packageData.x_axis_parameter = reqData.x_axis_parameter;
-                vm.packageData.y_axis_parameter = reqData.y_axis_parameter;
+                vm.packageData.endpoint = "/ocpu/library/"+vm.erc.id+"/R/"+reqData.figure_endpoint;
+                if (vm.tsType == true) {
+                    vm.packageData.x_axis_label = reqData.x_axis_label;
+                    vm.packageData.y_axis_label = reqData.y_axis_label;
+                    vm.packageData.x_axis_parameter = reqData.x_axis_parameter;
+                    vm.packageData.y_axis_parameter = reqData.y_axis_parameter;
+                }
 
                 var addWidgetValue = addWidget();
                 // check if widget inputfields are filled

client/app/creationProcess/uibindings.html

@@ -1,7 +1,12 @@
 <md-card>
     <md-card-content>
 
-      <h4>Upload Pacakges for OpenCPU</h4>
+      <div layout="row">
+        <h4>Upload Pacakges for OpenCPU</h4>
+        <span flex></span>
+        <h4 style="color:rgb(255, 0, 0)">erc ID :  {{vm.erc.id}}</h4>
+      </div>
+
       <p>Before you click "update" make sure you have added the figure to UI-Bindings</p>
 
       <md-list layout="column">
@@ -83,9 +88,9 @@ <h4>Figure Type</h4>
       <!-- Endpoint CARD -->
       <md-card style="width: 33%;">
         <md-card-content>
-          <h4>Figure Endpoint</h4>
+          <h4>Figure Function Name</h4>
           <md-input-container class="md-block" md-is-error="vm.showError('figure_endpoint')">
-            <label>Figure Endpoint</label>
+            <label>Figure Function Name</label>
             <input type="text" ng-model="vm.required.figure_endpoint" ng-value="vm.required.figure_endpoint" ng-change="vm.simpleUpdate('figure_endpoint', vm.required.figure_endpoint, false)" name="figure_endpoint" required>
             <div ng-messages="requiredForm.figure_endpoint.$error">
                 <div ng-message="required">Required field</div>
@@ -95,7 +100,7 @@ <h4>Figure Endpoint</h4>
       </md-card>
     </div>
 
-    <div layout="row">
+    <div layout="row" ng-if="vm.tsType">
       <!-- x_axis_label CARD -->
       <md-card style="width: 25%;">
         <md-card-content>