UI5 Week 2 Challenge

HexClan-dev · HexClan-dev · commit f257ff36944a · 2022-06-17T22:58:24.000+02:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "SAP HANA Database Explorer.displaySapWebAnalyticsStartupNotification": false
+}
diff --git a/CODEOWNERS b/CODEOWNERS
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,4 +38,4 @@
     "wdio-chromedriver-service": "^7.3.2",
     "wdio-ui5-service": "^0.9.0"
   }
-}
+}
diff --git a/webapp/controller/BaseController.js b/webapp/controller/BaseController.js
@@ -1,17 +1,27 @@
 sap.ui.define([
-    "sap/ui/core/mvc/Controller"
-], function (Controller) {
+    "sap/ui/core/mvc/Controller",
+    "sap/ui/core/UIComponent",
+    "sap/ui/core/routing/History"
+], function (Controller, UIComponent, History) {
     "use strict";
 
     return Controller.extend("ui5.challenge.controller.BaseController", {
         navTo: function (psTarget, pmParameters, pbReplace) {
             this.getRouter().navTo(psTarget, pmParameters, pbReplace);
         },
-        getRouter: function () {
-            return UIComponent.getRouterFor(this);
+
+        onNavBack: function () {
+            const sPreviousHash = History.getInstance().getPreviousHash();
+
+            if (sPreviousHash !== undefined) {
+                window.history.back();
+            } else {
+                this.getRouter().navTo("RouteMainView", {}, true /* no history*/ );
+            }
         },
-        onPress: function () {
 
+        getRouter: function () {
+            return UIComponent.getRouterFor(this);
         }
     });
-});
+});
diff --git a/webapp/controller/DetailController.controller.js b/webapp/controller/DetailController.controller.js
@@ -0,0 +1,15 @@
+sap.ui.define([
+    "./BaseController",
+    "sap/ui/model/json/JSONModel",
+    "sap/m/MessageToast",
+], function (Controller, JSONModel, MessageToast) {
+    "use strict";
+
+    return Controller.extend("ui5.challenge.controller.DetailController", {
+
+        goBack: function () {
+            this.onNavBack();
+        }
+
+    });
+});
diff --git a/webapp/controller/MainController.controller.js b/webapp/controller/MainController.controller.js
@@ -10,18 +10,23 @@ sap.ui.define([
             // This is used for Dynamically change title
             // document.title = 'ui5-challenge';
 
+            console.log(this.getView().byId('titleId'));
+
             var oDummyData = {
                 Employees: [{
-                    Name: "Name1",
-                    Surname: "Surname1",
+                    Id: 1,
+                    Name: "Betty",
+                    Surname: "Buzzell",
                     Age: 26
                 }, {
-                    Name: "Name2",
-                    Surname: "Surname2",
+                    Id: 2,
+                    Name: "Donna",
+                    Surname: "Rosen",
                     Age: 23
                 }, {
-                    Name: "Name3",
-                    Surname: "Surname3",
+                    Id: 3,
+                    Name: "Craig",
+                    Surname: "Reid",
                     Age: 32
                 }]
             };
@@ -31,8 +36,15 @@ sap.ui.define([
 
         },
 
-        onPress: function () {
-            MessageToast.show("You pressed the Button!");
+        onTestBtnPress: function (oEvent) {
+            console.log(oEvent);
+            MessageToast.show("You pressed the Test Button!");
+        },
+
+
+        onNextPagePress: function () {
+            this.navTo("RouteDetailView");
         }
+
     });
 });
diff --git a/webapp/i18n/i18n.properties b/webapp/i18n/i18n.properties
@@ -1,13 +1,14 @@
 
 browserTitle=ui5-challenge
 
-
 # Main Page
-mainPageTitle=ui5-challenge
+mainTitleText=wdi5 rocks
 appTitle=ui5-challenge
 appDescription=App test Desciption
 
 mainButtonText=Test Button
+nextNacButton=Go to Detail Page
 
 listEmployees=Employees
 
+
diff --git a/webapp/index.html b/webapp/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>ui5-challenge</title>
+    <title id="titleId">ui5-challenge</title>
 
     <script
         id="sap-ui-bootstrap"
diff --git a/webapp/manifest.json b/webapp/manifest.json
@@ -47,14 +47,35 @@
         "controlId": "app",
         "clearControlAggregation": false
       },
-      "routes": [],
-      "targets": {}
+      "routes": [{
+          "pattern": "",
+          "name": "RouteMainView",
+          "target": ["MainView"]
+        },
+        {
+          "pattern": "RouteDetail",
+          "name": "RouteDetailView",
+          "target": ["DetailView"]
+        }
+      ],
+      "targets": {
+        "MainView": {
+          "viewId": "Main",
+          "viewName": "Main",
+          "viewLevel": 1
+        },
+        "DetailView": {
+          "viewId": "Detail",
+          "viewName": "Detail",
+          "viewLevel": 2
+        }
+      }
     },
     "rootView": {
-      "viewName": "ui5.challenge.view.Main",
+      "viewName": "ui5.challenge.view.App",
       "type": "XML",
       "async": true,
-      "id": "shell"
+      "id": "app"
     },
     "models": {
       "i18n": {
diff --git a/webapp/test/e2e/week2.test.js b/webapp/test/e2e/week2.test.js
@@ -1,4 +1,6 @@
-const { wdi5 } = require("wdio-ui5-service")
+const {
+    wdi5
+} = require("wdio-ui5-service")
 const Main = require("./pageObjects/Main")
 
 describe("week2: main page", () => {
@@ -27,7 +29,7 @@ describe("week2: main page", () => {
             selector: {
                 id: "myControl",
                 viewName: Main._viewName
-              }
+            }
         })
         await control.firePress()
         const url = await browser.getUrl()
diff --git a/webapp/view/App.view.xml b/webapp/view/App.view.xml
@@ -0,0 +1,6 @@
+<mvc:View xmlns:mvc="sap.ui.core.mvc" displayBlock="true"
+    xmlns="sap.m">
+    <Shell id="shell">
+        <App id="app" />
+    </Shell>
+</mvc:View>
diff --git a/webapp/view/Detail.view.xml b/webapp/view/Detail.view.xml
@@ -0,0 +1,11 @@
+<mvc:View controllerName="ui5.challenge.controller.DetailController" displayBlock="true"
+    xmlns:mvc="sap.ui.core.mvc"
+    xmlns="sap.m">
+
+    <Page title="{i18n>mainTitleText}" showNavButton="true" navButtonPress=".goBack">
+        <content>
+            <Label text="Welcome to details Page" />
+
+        </content>
+    </Page>
+</mvc:View>
diff --git a/webapp/view/Main.view.xml b/webapp/view/Main.view.xml
@@ -1,31 +1,27 @@
 <mvc:View controllerName="ui5.challenge.controller.MainController" displayBlock="true"
     xmlns:mvc="sap.ui.core.mvc"
     xmlns="sap.m">
-    <Shell id="shell">
-        <App id="app">
-            <pages>
-                <Page title="{i18n>mainPageTitle}">
-                    <content>
 
-                        <Panel width="auto" title="Button Controller" class="sapUiSmallMargin">
-                            <content>
-                                <Button id="mainButton" text="{i18n>mainButtonText}" press=".onPress" />
-                            </content>
-                        </Panel>
+    <Page title="{i18n>mainTitleText}">
+        <content>
 
-                        <Panel width="auto" title="List Information" class="sapUiSmallMargin">
-                            <content>
-                                <List headerText="{i18n>listEmployees}" items="{
+            <Panel width="auto" title="Button Controller" class="sapUiSmallMargin">
+                <content>
+                    <Button id="mainButton" text="{i18n>mainButtonText}" press=".onTestBtnPress" />
+                    <Button id="myControl" text="{i18n>nextNacButton}" press=".onNextPagePress" />
+                </content>
+            </Panel>
+
+            <Panel width="auto" title="List Information" class="sapUiSmallMargin">
+                <content>
+                    <List id="employeeList" mode="SingleSelect" headerText="{i18n>listEmployees}" items="{
                                     path: '/Employees'
                                 }">
-                                    <StandardListItem title="{Name}" description="{Surname}" counter="{Age}"/>
-                                </List>
-                            </content>
-                        </Panel>
+                        <StandardListItem type="Active" title="{Name}" press=".onLinePress" description="{Surname}" counter="{Age}"/>
+                    </List>
+                </content>
+            </Panel>
 
-                    </content>
-                </Page>
-            </pages>
-        </App>
-    </Shell>
+        </content>
+    </Page>
 </mvc:View>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "SAP HANA Database Explorer.displaySapWebAnalyticsStartupNotification": false`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,4 @@`
`38`	`38`	`"wdio-chromedriver-service": "^7.3.2",`
`39`	`39`	`"wdio-ui5-service": "^0.9.0"`
`40`	`40`	`}`
`41`		`-}`
	`41`	`+}`