From 559d235bc9cce60385024fc91c6b6b18979e0109 Mon Sep 17 00:00:00 2001 From: Matan Bar Yosef Date: Wed, 24 Jun 2015 22:43:02 +0300 Subject: [PATCH] - thisProject Added - Tasks tab system - Added --- templates/js/app.js | 4 ++ .../js/controllers/thisProjectController.js | 16 ++++++++ templates/js/services/apiService.js | 1 - templates/views/campuses.html | 8 ++-- templates/views/index.html | 1 + templates/views/projects.html | 5 +-- templates/views/tasks.html | 38 ++++++++++++++++++- templates/views/thisProject.html | 36 ++++++++++++++++++ 8 files changed, 99 insertions(+), 10 deletions(-) create mode 100644 templates/js/controllers/thisProjectController.js create mode 100644 templates/views/thisProject.html diff --git a/templates/js/app.js b/templates/js/app.js index 2210b47..4ecf22f 100644 --- a/templates/js/app.js +++ b/templates/js/app.js @@ -65,6 +65,10 @@ app.config(['$routeProvider', '$locationProvider', .when('/campuses', { templateUrl: 'templates/views/campuses.html', controller: 'campusesController' + }) + .when('/thisProject', { + templateUrl: 'templates/views/thisProject.html', + controller: 'thisProjectController' }); } ]); diff --git a/templates/js/controllers/thisProjectController.js b/templates/js/controllers/thisProjectController.js new file mode 100644 index 0000000..a1cb837 --- /dev/null +++ b/templates/js/controllers/thisProjectController.js @@ -0,0 +1,16 @@ +angular.module('SeHub') +.controller('thisProjectController', ['$scope', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function ($scope, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService ,$rootScope) +{ + $scope.isEditPressed = false; + + $scope.editPressed = function() + { + $scope.isEditPressed = true; + console.log("EditPressed " + $scope.isEditPressed); + } + $scope.removeProject = function() + { + console.log("Project has been removed!"); + } + +}]); \ No newline at end of file diff --git a/templates/js/services/apiService.js b/templates/js/services/apiService.js index c80b38e..e619186 100644 --- a/templates/js/services/apiService.js +++ b/templates/js/services/apiService.js @@ -108,7 +108,6 @@ service.factory('apiService', ['$http', function($http) { }; return $http(req); }, - }, getClassesByCourse: function(){ // Need to add camusName (ngRoute) ~ sagi //TODO var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/ClassesByCourse/" + token; req = { diff --git a/templates/views/campuses.html b/templates/views/campuses.html index 96d5734..8d0ddf8 100644 --- a/templates/views/campuses.html +++ b/templates/views/campuses.html @@ -2,11 +2,11 @@

My Campuses

 - -
-
+ +
+
- + {{campus}} diff --git a/templates/views/index.html b/templates/views/index.html index d168b4d..03ff1ee 100644 --- a/templates/views/index.html +++ b/templates/views/index.html @@ -117,6 +117,7 @@ + \ No newline at end of file diff --git a/templates/views/projects.html b/templates/views/projects.html index d894468..f67486e 100644 --- a/templates/views/projects.html +++ b/templates/views/projects.html @@ -1,10 +1,9 @@
-

Projects

 - - Create Project diff --git a/templates/views/tasks.html b/templates/views/tasks.html index 7a9c87e..e90e8c5 100644 --- a/templates/views/tasks.html +++ b/templates/views/tasks.html @@ -1,6 +1,42 @@

Tasks

- Create Task +
+ Create Task +
+ +
+ + + + + +

Tab One

+

Commits...

+ + + + +

Tab Two

+

Issues...

+ + + + +

Tab Three

+

Bugs Bugs Bugs..

+ + + + +

Tab Two

+

Bla Bla Bla..

+ + + + + +
+
\ No newline at end of file diff --git a/templates/views/thisProject.html b/templates/views/thisProject.html new file mode 100644 index 0000000..98694f4 --- /dev/null +++ b/templates/views/thisProject.html @@ -0,0 +1,36 @@ +
+ +

{{user.name}}'s project

+
+
+
+ Project Creator: {{user.name}} +
+
+
+
+
+ Edit +
+
+ +
+
+
+
+
+
+
+ + Here Will Be Graph - Commits Over Period Of Time + +
+
+ + Here Will Be Graph (by columns) - Commits, Issues, Open Tasks + +
+
+
+ +
\ No newline at end of file