From d80c2661a1571f559bff0ed3e03231e0f2782a49 Mon Sep 17 00:00:00 2001 From: Sagi Dayan Date: Tue, 13 Jan 2015 02:14:24 +0200 Subject: [PATCH] Added Settings and UI tweaks Now you can lock the grade page with your password. still needs some work for unlocking - there should be a password prompt --- config.xml | 2 +- www/css/style.css | 14 +- www/js/ApiService.js | 10 +- www/js/app.js | 20 +++ www/js/controllers.js | 338 ++++++++++++++++++++---------------- www/templates/Aouth.html | 23 +++ www/templates/aguda.html | 91 ++++++++++ www/templates/grades.html | 22 --- www/templates/login.html | 25 --- www/templates/menu.html | 50 ++++-- www/templates/settings.html | 47 +++++ 11 files changed, 417 insertions(+), 225 deletions(-) create mode 100644 www/templates/Aouth.html create mode 100644 www/templates/aguda.html delete mode 100644 www/templates/login.html create mode 100644 www/templates/settings.html diff --git a/config.xml b/config.xml index 4ee665e..b2e398f 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + jceMobile Free Your Academic Data diff --git a/www/css/style.css b/www/css/style.css index 478ab7a..01132da 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -40,4 +40,16 @@ h1{ .page-content{ direction: rtl; padding: 15px; -} \ No newline at end of file + +} + +.settings{ + direction: ltr; +} + +.menu-tafrit{ + direction: rtl; + +} + + diff --git a/www/js/ApiService.js b/www/js/ApiService.js index e8dfc44..c9a3a4d 100644 --- a/www/js/ApiService.js +++ b/www/js/ApiService.js @@ -11,13 +11,7 @@ starter.factory('ApiService', ['$http', '$ionicPopup', '$ionicModal', function ( return $http.get(request).then(function(resp) { if(resp.data.guest == false){ - window.localStorage['loggedIn'] = true; - window.localStorage['fullName'] = resp.data.user_fullName; - window.localStorage['email'] = resp.data.user_email; - window.localStorage['phone'] = resp.data.user_phone; - window.localStorage['username'] = username; - window.localStorage['password'] = password; - + window.localStorage['userInfo'] = JSON.stringify(resp.data); console.log("[JCE] [INFO]: Success."); return true; }else{ @@ -25,7 +19,7 @@ starter.factory('ApiService', ['$http', '$ionicPopup', '$ionicModal', function ( title: 'שם משתמש או סיסמא שגויים', template: 'וודא שוב כי שם המשתמש והסיסמא הינם נכונים.' }); - console.log("[JCE] [INFO]: Wrong crads."); + console.log("[JCE] [INFO]: Wrong user/pass."); return false; } diff --git a/www/js/app.js b/www/js/app.js index cf1aed4..bbbaa28 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -70,6 +70,26 @@ app.run(function($ionicPlatform) { } }) + .state('app.aguda', { + url: "/aguda", + views: { + 'menuContent': { + templateUrl: "templates/aguda.html", + controller: 'AgudaCtrl' + } + } + }) + + .state('app.settings', { + url: "/settings", + views: { + 'menuContent': { + templateUrl: "templates/settings.html", + controller: 'SettingsCtrl' + } + } + }) + .state('app.grades', { url: "/grades", views: { diff --git a/www/js/controllers.js b/www/js/controllers.js index 0ca85cf..17eb6f6 100644 --- a/www/js/controllers.js +++ b/www/js/controllers.js @@ -4,12 +4,11 @@ angular.module('starter.controllers', []) = AppCtrl - Main = ======================================*/ -.controller('AppCtrl', function($scope, $rootScope, $ionicModal, $timeout, $http, $ionicPopup, $location) { +.controller('AppCtrl', function($scope, $ionicModal, $timeout, $ionicPopup, $ionicViewService, $location) { - // Form data for the login modal - $scope.loginData = {}; - + + $scope.lock = {}; var newNotes = false; $scope.logged = false; @@ -21,7 +20,7 @@ angular.module('starter.controllers', []) $scope.userData = null; // Create the login modal that we will use later - $ionicModal.fromTemplateUrl('templates/login.html', { + $ionicModal.fromTemplateUrl('templates/Aouth.html', { scope: $scope }).then(function(modal) { $scope.modal = modal; @@ -29,30 +28,38 @@ angular.module('starter.controllers', []) - - - $scope.isLoggedIn = function(){ - if($scope.userData == null) - return false; - console.log("[JCE] [Info] User hase loged in once!"); - return true; - }; - - $scope.newNotes = function(){ - var newNote = window.localStorage['newNotes'] || "false"; - return (newNote == "true") ? true : false; - }; + if((window.localStorage['userInfo'] || null) === null ) + $scope.isLoggedIn = false; + else + $scope.isLoggedIn = true; - // Triggered in the login modal to close it - $scope.closeLogin = function() { + // Triggered in the Aouth modal to close it + $scope.closeAouth = function() { $scope.modal.hide(); }; - // Open the login modal - $scope.login = function() { - $scope.modal.show(); + // Aouth for Grades + $scope.Aouth = function() { + console.log("Clicked GoOn - password enterd: "+ $scope.lock.password + "\nThe logs pass is: "+window.localStorage['password']); + + if($scope.lock.password === (window.localStorage['password'] || null)){ //ok + $scope.lock.password = ""; + $scope.modal.hide(); + $ionicViewService.nextViewOptions({ + disableBack: true }); + + $location.path( "/app/grades" ); + }else{ + var alertPopup = $ionicPopup.alert({ + title: 'סיסמה שגוייה', + template: 'טעות בסיסמה' + }); + alertPopup.then(function(res) { + $scope.modal.hide(); + }); + } }; @@ -65,15 +72,29 @@ angular.module('starter.controllers', []) }; - $scope.$watch(window.localStorage['logged'], function() { - console.log('[JCE] [INFO]: CHANGED!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'); - var tempBool = (window.localStorage['logged'] || false); - if(tempBool == "true") - $scope.logged = true; - else - $scope.logged = false; + $scope.openGrades = function(){ + var localSettingsStr = window.localStorage['Settings'] || null; + if (localSettingsStr !== null){ + var isLocked = (JSON.parse(localSettingsStr))[0].val; + } + if(isLocked){ + console.log("[JCE] [INFO]: Grades Locked"); + $scope.modal.show(); + } + else{ + console.log("Unlocked"); + $ionicViewService.nextViewOptions({ + disableBack: true }); + $location.path( "/app/grades" ); + } + }; - }); + $scope.menuClicked = function(){ + if((window.localStorage['userInfo'] || null) === null ){ + $scope.isLoggedIn = false; + }else + $scope.isLoggedIn = true; + }; @@ -156,25 +177,75 @@ angular.module('starter.controllers', []) } - $scope.getMedal = function(grade){ - if(grade < 55){ - return "https://wiki.openttd.org/images/1/10/Face-Sick-120px.png"; - }else if( 55<= grade && grade < 70){ - return "https://encrypted-tbn2.gstatic.com/images?q=tbn:ANd9GcT6UK4UUxagOktpvJR_P433nvOeTDuV3rOxd0Mswo8T-tRueFmN"; - }else if( 70<= grade && grade < 80){ - return "https://encrypted-tbn2.gstatic.com/images?q=tbn:ANd9GcRz0_NkZPM9FSymaCqFObwGPQFA9vRGZ82DEM7jfFU6xQ3qLbu8oQ"; - }else if( 80<= grade && grade < 95){ - return "data:image/jpeg;base64,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"; - }else{ - return "https://encrypted-tbn1.gstatic.com/images?q=tbn:ANd9GcRR0zMfWYUcjYyXjGUQY3tDj04rIFfi_CThbaolxTt_38eL1hkFmQ"; - } + // $scope.getMedal = function(grade){ + // if(grade < 55){ + // return "https://wiki.openttd.org/images/1/10/Face-Sick-120px.png"; + // }else if( 55<= grade && grade < 70){ + // return "https://encrypted-tbn2.gstatic.com/images?q=tbn:ANd9GcT6UK4UUxagOktpvJR_P433nvOeTDuV3rOxd0Mswo8T-tRueFmN"; + // }else if( 70<= grade && grade < 80){ + // return "https://encrypted-tbn2.gstatic.com/images?q=tbn:ANd9GcRz0_NkZPM9FSymaCqFObwGPQFA9vRGZ82DEM7jfFU6xQ3qLbu8oQ"; + // }else if( 80<= grade && grade < 95){ + // return "data:image/jpeg;base64,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"; + // }else{ + // return "https://encrypted-tbn1.gstatic.com/images?q=tbn:ANd9GcRR0zMfWYUcjYyXjGUQY3tDj04rIFfi_CThbaolxTt_38eL1hkFmQ"; + // } - return "sdfgg"; - }; + // return "sdfgg"; + // }; }) + + +/*============================================= += Settings - controller = +=============================================*/ + + + + +.controller('SettingsCtrl', function($scope, $stateParams, $http) { + + var localSettingsStr = window.localStorage['Settings'] || null; + if (localSettingsStr === null){ + var settings_list = [ {text:"נעל גיליון ציונים", val: false}, //[0] + {text:"הצג מזג אויר", val: false} ]; //[1] + console.log("[JCE] [info]: No settings found!"); + } + else{ + settings_list = JSON.parse(localSettingsStr); + console.log("[JCE] [info]: settings found!"); + } + + $scope.settings = settings_list; + + $scope.toggled = function(){ + console.log("[JCE] [info]: Setting Changed"); + window.localStorage['Settings'] = JSON.stringify($scope.settings); + }; + + + +}) + + +/*============================================= += Aguda News - controller = +=============================================*/ + + + + +.controller('AgudaCtrl', function($scope, $stateParams, $http) { + var notesStr = window.localStorage['notes'] || null; + console.log(notesStr); + if(notesStr != null) + $scope.newss = JSON.parse(notesStr); + + + +}) /*============================================= = JCE News - controller = =============================================*/ @@ -200,37 +271,11 @@ angular.module('starter.controllers', []) -.controller('LoginCtrl', function($scope, $stateParams, $http, $location, $ionicPopup, $ionicViewService, $state) { - - function getNotes(){ - var notes = window.localStorage['notes'] || null; - return $http.get('https://mipo.jce.ac.il/index.php/site/studentMessages').then(function(resp) { - if(notes === null){ - window.localStorage['notes'] = JSON.stringify(resp.data); - return true; - }else if(notes === JSON.stringify(resp.data)){ - return false; - }else{ - window.localStorage['notes'] = JSON.stringify(resp.data); - return true; - } - $scope.$apply(); - console.log("[JCE] [INFO] Got JCE News!"); - }, function(err) { - console.error('ERR', err); - // err.status will contain the status code - }) - } - - - +.controller('LoginCtrl', function($scope, $http, $location, $ionicPopup, $ionicViewService, $timeout, $ionicLoading, ApiService) { var userStr = window.localStorage['userInfo'] || null; - + $scope.loginData = {}; if(userStr !== null){ - if(getNotes() == true){ - window.localStorage['newNotes'] = "true"; - } $ionicViewService.nextViewOptions({ disableBack: true }); @@ -244,85 +289,32 @@ angular.module('starter.controllers', []) // Perform the login action when the user submits the login form $scope.doLogin = function() { - console.log('[JCE] [Info] Doing login', $scope.loginData); + ApiService.login($scope.loginData.username, $scope.loginData.password); - //JCE Login shit: - var request = "https://mipo.jce.ac.il/index.php/site/login?_dc=1419773997764&formValues=%7B%22form_fields%22%3A%7B%22name%22%3A%22"+$scope.loginData.username+"%22%2C%22pwd%22%3A%22"+$scope.loginData.password+"%22%7D%7D&callback=JSON_CALLBACK"; - - $http.get(request).then(function(resp) { - console.log('Success', resp); - console.log('!!!\n'+JSON.stringify(resp.data)+'\n!!!', resp); - if(resp.data.guest == false){ - - window.localStorage['name'] = $scope.loginData.username; - window.localStorage['pass'] = $scope.loginData.password; - - $scope.userData = resp.data; - window.localStorage['userInfo'] = JSON.stringify(resp.data); - - - // // if(getNotes() == true){ - // window.localStorage['newNotes'] = "true"; - // // } - - // window.localStorage['logged'] = "true"; - - // // $state.forceReload(); - - // // $state.go($state.current, {}, {reload: true}); - // // + $ionicLoading.show({template: 'אנא המתן...'}); //close the popup after 3 seconds for some reason + $timeout(function() { + $ionicLoading.hide(); + if( (window.localStorage['userInfo'] || false) != false){ + window.localStorage['password'] = $scope.loginData.password; var alertPopup = $ionicPopup.alert({ - title: 'ההתחברות בוצעה בהצלחה!', - template: 'עקב בעיות גרסה. התוכנה תיסגר עכשיו. אנא כנס שוב כדי להנות מן האפשוריות' - }); + title: 'ברוכים הבאים!', + template: 'ההתחברות בוצעה בהצלחה!' + }); alertPopup.then(function(res) { - console.log('[JCE] [Info] Popup Confirmed - wrong Username/Password'); - navigator.app.exitApp(); - $scope.closeLogin(); - }); + $ionicViewService.nextViewOptions({ + disableBack: true + }); - $ionicViewService.nextViewOptions({ - disableBack: true + $location.path( "/app/home" ); //Start app }); - $location.path( "/app/home" ); - - - - console.log("[JCE] [Info] Login Was SUCCESSFULL!!", resp); - }else{ - var alertPopup = $ionicPopup.alert({ - title: 'הזנה שגויה', - template: 'וודא כי שם המשתמש וסיסמה נכונים' - }); - alertPopup.then(function(res) { - console.log('[JCE] [Info] Popup Confirmed - wrong Username/Password'); - $scope.closeLogin(); - }); - console.log("Login Faild!", resp); } - }, function(err) { - var alertPopup = $ionicPopup.alert({ - title: 'שגיאת התחברות', - template: 'ישנה שגיאת התחברות - נסה מאוחר יותר' - }); - alertPopup.then(function(res) { - console.log('[JCE] [Info] Popup Confirmed - Error Network'); - $scope.closeLogin(); - }); - console.error('[JCE] [error] ERR', err); - // err.status will contain the status code - }); + }, 2000); - - - -$scope.logout = function(){ - localStorage.clear(); - navigator.app.exitApp(); -}; + }; + }) /*======================================= @@ -330,10 +322,17 @@ $scope.logout = function(){ =======================================*/ -.controller('homeCtrl', function($scope, $stateParams, $ionicViewService, $location, $timeout, $rootScope, ApiService) { +.controller('homeCtrl', function($scope, $stateParams, $ionicViewService, $location, $timeout, $rootScope, $ionicModal, ApiService) { + $scope.lock = {}; + // Create the login modal that we will use later + $ionicModal.fromTemplateUrl('templates/Aouth.html', { + scope: $scope + }).then(function(modal) { + $scope.modal = modal; + }); $scope.update = function(){ console.log("[JCE] [info]: Refreshing..."); @@ -369,12 +368,22 @@ $scope.logout = function(){ }; $scope.goToGrades = function(){ - window.localStorage['newGrades'] = "false"; - $scope.newGrades = false; - $ionicViewService.nextViewOptions({ - disableBack: true - }); - $location.path( "/app/grades" ); + var localSettingsStr = window.localStorage['Settings'] || null; + if (localSettingsStr !== null){ + var isLocked = (JSON.parse(localSettingsStr))[0].val; + } + if(isLocked){ + console.log("[JCE] [INFO]: Grades Locked"); + $scope.modal.show(); + } + else{ + window.localStorage['newGrades'] = "false"; + $scope.newGrades = false; + console.log("Unlocked"); + $ionicViewService.nextViewOptions({ + disableBack: true }); + $location.path( "/app/grades" ); + } }; $scope.isLoggedIn = function(){ @@ -388,7 +397,6 @@ $scope.logout = function(){ // }); - $scope.version = "0.1.13alfa-develop_perview"; if(window.localStorage['newNotes'] == "true"){ $scope.newNotes = true; @@ -404,7 +412,37 @@ $scope.logout = function(){ + // Triggered in the Aouth modal to close it + $scope.closeAouth = function() { + $scope.modal.hide(); + }; + // Aouth for Grades + $scope.Aouth = function() { + console.log("Clicked GoOn - password enterd: "+ $scope.lock.password + "\nThe logs pass is: "+window.localStorage['password']); + + if($scope.lock.password === (window.localStorage['password'] || null)){ //ok + $scope.lock.password = ""; + $scope.modal.hide(); + window.localStorage['newGrades'] = "false"; + $scope.newGrades = false; + $ionicViewService.nextViewOptions({ + disableBack: true }); + + $location.path( "/app/grades" ); + }else{ + var alertPopup = $ionicPopup.alert({ + title: 'סיסמה שגוייה', + template: 'טעות בסיסמה' + }); + alertPopup.then(function(res) { + $scope.modal.hide(); + }); + } + }; +////////////////////////////////////////////////////////// + $scope.version = "0.1.28alpha-develop_perview"; +///////////////////////////////////////////////////////// }); diff --git a/www/templates/Aouth.html b/www/templates/Aouth.html new file mode 100644 index 0000000..40ff70e --- /dev/null +++ b/www/templates/Aouth.html @@ -0,0 +1,23 @@ + + +

הגיליון נעול

+
+ +
+ + +
+
+
+ + +
+
+
+ + diff --git a/www/templates/aguda.html b/www/templates/aguda.html new file mode 100644 index 0000000..83d675c --- /dev/null +++ b/www/templates/aguda.html @@ -0,0 +1,91 @@ + + +
+ +

אגודת הסטודנטים

+ +

גרסת פיתוח - הנתונים כאן לא מתעדכנים!

+ + +
+ +
+ +

פאנג'ויה!

+

November 05, 1955

+
+ +
+ +

את הטפסים יש לשלוח בדיוק בשעה שקיבלתם בהרשמה לתורים.

*** טפסים להורדה:
www.funjoya.co.il/funjoya-form-jr2015.pdf

***בעת הגשת הטפסים פיזית/בדוא"ל יתבצע אימות לשעה ולתאריך ע"פ מספר תעודת הזהות. סטודנט אשר לא יפעל על פי ההוראות, הזמנתו לא תתקבל.

+

+ 1 Like + 5 Comments +

+
+ +
+ + + Like + + + + Comment + + + + Share + +
+ +
+ + +
+ +
+ +

טורניר שש בש

+

November 04, 2014

+
+ +
+ + הטורניר השנתי ממשיך... +

+ 7 Like + 5 Comments +

+
+ +
+ + + Like + + + + Comment + + + + Share + +
+ +
+ + + + + + +
+ + + + + + + diff --git a/www/templates/grades.html b/www/templates/grades.html index 76d2279..ee19583 100644 --- a/www/templates/grades.html +++ b/www/templates/grades.html @@ -3,28 +3,6 @@

גיליון ציונים

- - - - -
diff --git a/www/templates/login.html b/www/templates/login.html deleted file mode 100644 index 00759fe..0000000 --- a/www/templates/login.html +++ /dev/null @@ -1,25 +0,0 @@ - - -

התחבר

-
- -
- - -
-
- - - -
-
- - diff --git a/www/templates/menu.html b/www/templates/menu.html index e7a1ab4..7788455 100644 --- a/www/templates/menu.html +++ b/www/templates/menu.html @@ -4,48 +4,62 @@ - - - +

תפריט

 +
- - -התחבר + + + התחבר - -עמוד הבית + + עמוד הבית - -הודעות אגודת הסטודנטים + + אגודת הסטודנטים - -הודעות + + הודעות - -גיליון ציונים + + גיליון ציונים - -מערכת שעות + + מערכת שעות - -התנתק + + הגדרות + + + התנתק +
+
+

+ עליך להתחבר תחילה על מנת להנות משלל האפשרויות +

+
+
+ +
 + diff --git a/www/templates/settings.html b/www/templates/settings.html new file mode 100644 index 0000000..0288476 --- /dev/null +++ b/www/templates/settings.html @@ -0,0 +1,47 @@ + + +
+

הגדרות

+ +
+
    +
  • + {{ setting.text }} + +
    • +
+
+ +

אודות

+
+ +
+ +

שגיא דיין

+

מפתח ראשי

+
+ +
+ +

+ התוכנה נוצרה למען הסטודנטים. +

+

+ כל הקוד זמין בgithub - וכך גם הוראות הבניה והקימפול. +
הרישיון של תוכנה זו היא כדלקמן: "עשה מה שבא לך - לא מעניין אותי" +

+ + + + +
+ + +
+ + \ No newline at end of file