fiveapples 0.0.5 → 0.0.6

data/lib/ui5/controller/BreederList.controller.js

@@ -18,11 +18,11 @@ sap.ui.define(
         var iIndex = oTable.getSelectedIndex();
 
         var oCtxt = oTable.getContextByIndex(iIndex);
-        var sToPageId = oCtxt.getProperty("id");
-
-        var oRouter = sap.ui.core.UIComponent.getRouterFor(this);
-        //            MessageToast.show(" navTo cultivar_detail -->"+sToPageId);
-        oRouter.navTo("breeder_detail", { id: sToPageId });
+        if (oCtxt) {
+          var sToPageId = oCtxt.getProperty("id");
+          var oRouter = sap.ui.core.UIComponent.getRouterFor(this);
+          oRouter.navTo("breeder_detail", { id: sToPageId });
+        }
       }
     });
   }

data/lib/ui5/controller/Breeder_Create.controller.js

@@ -2,68 +2,39 @@ sap.ui.define(
   [
     "sap/ui/core/mvc/Controller",
     "sap/m/MessageToast",
-    "sap/ui/core/routing/History"
+    "./Detail",
+    "./Create"
   ],
-  function(Controller, MessageToast, History) {
+  function(Controller, MessageToast, Detail, Create) {
     "use strict";
     return Controller.extend("fivea.controller.Breeder_Create", {
       onInit: function() {
         this._oRouter = sap.ui.core.UIComponent.getRouterFor(this);
+        this._oRouter
+          .getRoute("breeder_create")
+          .attachPatternMatched(this.createEntry, this);      
+      },
+      createEntry: function(){
         var oView = this.getView();
         var oModel = this.getOwnerComponent().getModel();
         var oContext = oModel.createEntry("/breeder", {});
         oView.setModel(oModel);
-        oView.setBindingContext(oContext);          
+        oView.setBindingContext(oContext);  
       },
-      onNavPress: function() {
-        var oHistory = History.getInstance();
-        var sPreviousHash = oHistory.getPreviousHash();
-
-        if (sPreviousHash !== undefined) {
-          // history contains a previous entry
-          window.history.go(-1);
-        } else {
-          this._oRouter.navTo("breederList");
-        }
+      navToList: function(){
+        this._oRouter.navTo("breederList", true);
       },
-      onCreate: function() {
-        var oModel = this.getView().getModel();
-        var _oRouter = this._oRouter;
-
-    
-        function onSuccessHandler(data) {
-          MessageToast.show("Create success");
-          // TODO: isnt this data access OData version dependant?
-          // OneWay is simply 
-          // var new_entity_tab = data
-          
-          // The TwoWay way. No this is not ridiculous. You tell me the better way ?
-          var new_entity_tab = data["__batchResponses"]["0"].__changeResponses["0"].data;
-          _oRouter.navTo("breeder_detail", {  id: new_entity_tab["results"][0].id   });
-        }
-        function onErrorHandler() {
-          MessageToast.show("Create failed");
-        }
-        var mParms = {};
-        
-        mParms.success = onSuccessHandler;
-        mParms.error = onErrorHandler;
-
-        oModel.submitChanges(mParms);
-    
-        
-              },
-
       onNavBack: function() {
-        var oHistory = History.getInstance();
-        var sPreviousHash = oHistory.getPreviousHash();
+        Detail.onNavBack(this);
+      },
+      onCreatePress: function() {  
+        Create.onPress(this);
+      },
+      navToDetail: function(oData){
+        // navigate to detail page but dont keep create 
+        // page history (hist. replace)        
 
-        if (sPreviousHash !== undefined) {
-          window.history.go(-1);
-        } else {
-          var oRouter = sap.ui.core.UIComponent.getRouterFor(this);
-          oRouter.navTo("breederList", true);
-        }
+        this._oRouter.navTo("breeder_detail", {  id: oData.id   }, {}, true);
       }
     });
   }

data/lib/ui5/controller/Breeder_Detail.controller.js

@@ -1,10 +1,12 @@
+
 sap.ui.define(
   [
     "sap/ui/core/mvc/Controller",
     "sap/m/MessageToast",
-    "sap/ui/core/routing/History"
+    "./FileUpload",
+    "./Detail"
   ],
-  function(Controller, MessageToast, History) {
+  function(Controller, MessageToast, FileUpload, Detail) {
     "use strict";
     return Controller.extend("fivea.controller.Breeder_Detail", {
       onInit: function() {
@@ -12,6 +14,7 @@ sap.ui.define(
         this._oRouter
           .getRoute("breeder_detail")
           .attachPatternMatched(this.onDetailMatched, this);
+        this._entity_name = 'Breeder';
       },
       onDetailMatched: function(oEvent) {
         this._sObjectID = oEvent.getParameter("arguments").id;
@@ -20,9 +23,57 @@ sap.ui.define(
         var oView = this.getView();
         
         oView.bindElement({ path: sObjectPath });
+        
+        var oAvatar = this.byId("avatar");
+        this._sAvatar = oAvatar;
+        this._sAvatarImage = false;
+        this.loadAvatar();
+      },
+      loadAvatar: function() {
+        var sImgsPath = this._sObjectPath + "/avatar";
+        var that = this;
+        var oView = this.getView();
+        var oModel = oView.getModel();
+        var oAvatar = that.byId("avatar");
+                   
+        function _loadavsuccs(oData, response) {
+          // UploadUrl for Avatar creation (first time)
+          var oUrl = "/odata"+that._sObjectPath+"/avatar";
+          var oSrc = null;
+          if (oData.avatar !== undefined ){
+            if (Object.keys(oData.avatar).length === 0) {
+              var oI = oData.first_name.trim()[0] + oData.last_name.trim()[0];
+              oAvatar.setInitials(oI);
+            }
+            else{
+              oUrl = "/odata"+that._sObjectPath+"/avatar/$value";      
+              oSrc = oData.avatar.__metadata.media_src;
+// Avatar was already uploaded. UploadUrl should be for an Update
+// but it's not yet implemented in safrano 0.4  
+// (POST /Photo(4)/$value ...safrano-todo)              
+              oUrl = oSrc
+              
+            }
+          }
+          oAvatar.setSrc(oSrc);
+          oView.byId("fileUploader").setUploadUrl(oUrl);
+          oView.byId("fileUploader").setValue("");
+        }
+        
+        function _loadaverr(oErr) {        }
+        
+        oModel.read(this._sObjectPath, 
+                    { urlParameters:{$expand: "avatar"}, 
+                      success: _loadavsuccs, 
+                      error: _loadaverr });
+      },
+      handleUploadComplete: function() {
+        FileUpload.onComplete(this);
+        this.loadAvatar();
+      },
+      handleUploadPress: function() {
+        FileUpload.onPress(this) ;
       },
-      
-      _onBindingChange: function(oEvent) {},
       
       onCultivarSelectionChange: function() {
         var oTable = this.byId("breeder_cultivar_table");
@@ -30,99 +81,19 @@ sap.ui.define(
 
         var oCtxt = oTable.getContextByIndex(iIndex);
         var sToPageParID = oCtxt.getProperty("id");
-        var oRouter = sap.ui.core.UIComponent.getRouterFor(this);
-        oRouter.navTo("cultivar_detail", { id: sToPageParID });
+        this._oRouter.navTo("cultivar_detail", { id: sToPageParID });
       },
-      
       onDeletePress: function(evt) {
-        var oView = this.getView();
-        var oModel = oView.getModel();
-
-        var mParms = {};
-
-        var oDeleteDialog = new sap.ui.commons.Dialog();
-        oDeleteDialog.setTitle("Delete Breeder");
-        var oText = new sap.ui.commons.TextView({
-          text: "Are you sure to delete this Breeder?"
-        });
-        var _that = this;
-        oDeleteDialog.addContent(oText);
-        oDeleteDialog.addButton(
-          new sap.ui.commons.Button({
-            text: "Confirm",
-            press: function() {
-              var mParms = {};
-
-              mParms.success = function(data, response) {
-                oDeleteDialog.close();
-                _that._oRouter.navTo("breederList");
-                // oModel.refresh();
-              };
-              mParms.error = function(error) {
-                oDeleteDialog.close();
-                MessageToast.show("Delete failed");
-              };
-              var sMsg;
-              sMsg = oView.getBindingContext();
-              mParms.context = sMsg;
-              oModel.remove("", mParms);
-            }
-          })
-        );
-        oDeleteDialog.open();
+        Detail.onDeletePress(this, evt);
       },
-      
       onSave: function() {
-        var oView = this.getView();
-        var oModel = oView.getModel();
-        var mParms = {};
-
-
-        function onSuccessHandler() {
-          oModel.refresh();
-          oModel.updateBindings();
-          MessageToast.show("Update success");
-        }
-        
-        function onErrorHandler() {
-          MessageToast.show("Update failed");
-        }
-        
-        //var sPath = this._sObjectPath;
-        //var oData = oModel.getData(sPath);
-        //console.log("Model data:", oData);
-        //console.log("Model has pending changes:", oModel.hasPendingChanges());
-        //console.log("Pending changes:", oModel.getPendingChanges());
-
-        mParms.success = onSuccessHandler;
-        mParms.error = onErrorHandler;
-
-        oModel.setTokenHandlingEnabled(true);
-        oModel.updateSecurityToken();
-
-        oModel.submitChanges(mParms);
-      },    
-
-      onCheck: function() {
-        var oView = this.getView();
-        var oModel = oView.getModel();
-        var sPath = this._sObjectPath;
-        var oData = oModel.getData(sPath);
-        console.log("Model data:", oData);
-        console.log("Model has pending changes:", oModel.hasPendingChanges());
-        console.log("Pending changes:", oModel.getPendingChanges());
+        Detail.onSave(this);
+      },
+      navToList: function(){
+        this._oRouter.navTo("breederList", true);
       },
-
       onNavBack: function() {
-        var oHistory = History.getInstance();
-        var sPreviousHash = oHistory.getPreviousHash();
-
-        if (sPreviousHash !== undefined) {
-          window.history.go(-1);
-        } else {
-          var oRouter = sap.ui.core.UIComponent.getRouterFor(this);
-          oRouter.navTo("breederList", true);
-        }
+        Detail.onNavBack(this);
       }
     });
   }

data/lib/ui5/controller/Create.js

@@ -0,0 +1,41 @@
+
+/**  
+* Common helper/callbacks for entity creation
+* 
+* **/
+
+sap.ui.define(["sap/m/MessageToast"], 
+function(MessageToast) {
+   
+   "use strict";
+
+    return {
+      onPress: function(that) {
+        
+        var oModel = that.getView().getModel();
+    
+        function onSuccessHandler(data) {
+          MessageToast.show("Create success");
+          // isnt this data access OData version dependant?
+          // OneWay is simply 
+          // var new_entity_tab = data
+                    
+          // The TwoWay way. No this is not ridiculous. 
+          // You tell me the better way ?
+
+          var entity_tab = data.__batchResponses[0].__changeResponses[0].data;
+          that.navToDetail(entity_tab.results[0]);
+        }
+        function onErrorHandler() {
+          MessageToast.show("Create failed");
+        }
+        var mParms = {};
+        
+        mParms.success = onSuccessHandler;
+        mParms.error = onErrorHandler;
+
+        oModel.submitChanges(mParms);
+      },
+   };
+  }
+);

data/lib/ui5/controller/CultivarList.controller.js

@@ -19,10 +19,11 @@ sap.ui.define(
         var iIndex = oTable.getSelectedIndex();
 
         var oCtxt = oTable.getContextByIndex(iIndex);
-        var sToPageId = oCtxt.getProperty("id");
-
-        var oRouter = sap.ui.core.UIComponent.getRouterFor(this);
-        oRouter.navTo("cultivar_detail", { id: sToPageId });
+        if (oCtxt) {
+          var sToPageId = oCtxt.getProperty("id");
+          var oRouter = sap.ui.core.UIComponent.getRouterFor(this);
+          oRouter.navTo("cultivar_detail", { id: sToPageId });
+        }
       }
     });
   }

data/lib/ui5/controller/Cultivar_Create.controller.js

@@ -2,108 +2,53 @@ sap.ui.define(
   [
     "sap/ui/core/mvc/Controller",
     "sap/m/MessageToast",
-    "sap/ui/core/routing/History"
+    "./Detail",
+    "./Breeder",
+    "./Create"
   ],
-  function(Controller, MessageToast, History) {
+  function(Controller, MessageToast, Detail, Breeder, Create) {
     "use strict";
     return Controller.extend("fivea.controller.Cultivar_Create", {
       onInit: function() {
-        var oRouter = sap.ui.core.UIComponent.getRouterFor(this);
-        this._oRouter = oRouter;
-        
+        this._oRouter = sap.ui.core.UIComponent.getRouterFor(this);
+        this._oRouter
+          .getRoute("cultivar_create")
+          .attachPatternMatched(this.createEntry, this);      
+      },
+      createEntry: function(){
         var oView = this.getView();
         var oModel = this.getOwnerComponent().getModel();
         var oContext = oModel.createEntry("/cultivar", {});
         oView.setModel(oModel);
-        oView.setBindingContext(oContext);
+        oView.setBindingContext(oContext);  
       },
-
-      onCreatePress: function() {
-        
-        var oModel = this.getView().getModel();
-        var _oRouter = this._oRouter;
-
-    
-        function onSuccessHandler(data) {
-          MessageToast.show("Create success");
-          // TODO: isnt this data access OData version dependant?
-          // OneWay is simply 
-          // var new_entity_tab = data
-          
-          // The TwoWay way. No this is not ridiculous. You tell me the better way ?
-          var new_entity_tab = data["__batchResponses"]["0"].__changeResponses["0"].data;
-          _oRouter.navTo("cultivar_detail", {  id: new_entity_tab["results"][0].id   });
-        }
-        function onErrorHandler() {
-          MessageToast.show("Create failed");
-        }
-        var mParms = {};
-        
-        mParms.success = onSuccessHandler;
-        mParms.error = onErrorHandler;
-
-        oModel.submitChanges(mParms);
+      onCreatePress: function() {  
+        Create.onPress(this);
+      },
+      navToDetail: function(oData){
+        // navigate to detail page but dont keep create 
+        // page history (hist. replace)        
         
-
+        this._oRouter.navTo("cultivar_detail", {  id: oData.id   }, {}, true);
+      },
+      navToList: function(){
+        this._oRouter.navTo("cultivarList", true);
       },
-
       onNavBack: function() {
-        var oHistory = History.getInstance();
-        var sPreviousHash = oHistory.getPreviousHash();
-
-        if (sPreviousHash !== undefined) {
-          window.history.go(-1);
-        } else {
-          this._oRouter.navTo("cultivarList", true);
-        }
+        Detail.onNavBack(this);
       },
-
       inputId: "",
       inputDescrId: "",
-
       onBreederIdValueHelp: function(oEvent) {
-        this.inputId = oEvent.getSource().getId();
-        this.inputDescrId = this.inputId + "_descr";
-
-        // create value help dialog
-        if (!this._valueHelpDialog) {
-          this._valueHelpDialog = sap.ui.xmlfragment(
-            "fivea.view.BreederOptio",
-            this
-          );
-
-          this.getView().addDependent(this._valueHelpDialog);
-        }
-
-        this._valueHelpDialog.open("");
+        Breeder.onIdValueHelp(this, oEvent);
       },
 
       _handleValueHelpSearch: function(evt) {
-        var sValue = evt.getParameter("value");
-        var oFilter = new Filter(
-          "name",
-          sap.ui.model.FilterOperator.Contains,
-          sValue
-        );
-        evt
-          .getSource()
-          .getBinding("items")
-          .filter([oFilter]);
+        Breeder._handleValueHelpSearch(evt);
       },
 
       _handleValueHelpClose: function(evt) {
-        var oSelectedItem = evt.getParameter("selectedItem");
-        if (oSelectedItem) {
-          var IDInput = this.getView().byId(this.inputId);
-          IDInput.setValue(oSelectedItem.getDescription());
-
-          var oText = this.getView().byId(this.inputDescrId);
-          oText.setText(oSelectedItem.getTitle());
-        }
-        evt
-          .getSource()
-          .getBinding("items")
-          .filter([]);
+        Breeder._handleValueHelpClose(this, evt);
       }
     });
   }