From 0575c64f4e53e77ac4dcad50bcadc0a014047856 Mon Sep 17 00:00:00 2001
From: Victorma Perez Colado <victormp@ucm.es>
Date: Tue, 30 May 2017 15:31:49 +0200
Subject: [PATCH] Creation element placeholders and error feedback

---
 app/public/js/controllers/activities.js | 4 ++++
 app/views/classActivity.jade            | 3 ++-
 app/views/gameActivity.jade             | 5 +++--
 app/views/home.jade                     | 7 ++++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/public/js/controllers/activities.js b/app/public/js/controllers/activities.js
index 4460e2d..8cafe07 100644
--- a/app/public/js/controllers/activities.js
+++ b/app/public/js/controllers/activities.js
@@ -160,13 +160,16 @@ angular.module('activitiesApp', ['ngStorage', 'services'])
             };
 
             $scope.createActivity = function () {
+                $scope.activityCreatedError = '';
                 if (!$scope.activity.gameId && !QueryParams.getQueryParam('game')) {
                     // It's necessary to pick a game
+                    $scope.activityCreatedError = 'Please, select a game.';
                     return;
                 }
 
                 if (!$scope.activity.classId && !QueryParams.getQueryParam('class')) {
                     // It's necessary to pick a class
+                    $scope.activityCreatedError = 'Please, select a class.';
                     return;
                 }
 
@@ -224,6 +227,7 @@ angular.module('activitiesApp', ['ngStorage', 'services'])
             };
 
             $scope.activityOpenedError = '';
+            $scope.activityCreatedError = '';
             $scope.deleteActivity = function (activityObj) {
                 if (activityObj) {
                     $http.delete(CONSTANTS.PROXY + '/activities/' + activityObj._id).success(function () {
diff --git a/app/views/classActivity.jade b/app/views/classActivity.jade
index 314080b..0e95dd6 100644
--- a/app/views/classActivity.jade
+++ b/app/views/classActivity.jade
@@ -30,13 +30,14 @@ block content
                         .panel-heading Create a new Activity
                         .panel-body
                             label Activity title:
-                                input.form-control(type='text' ng-model='activity.name')
+                                input.form-control(placeholder='New Activity' type='text' ng-model='activity.name')
                             label Game:
                                 select.form-control(ng-controller='AppCtrl' ng-model='activity.gameId')
                                     option(ng-repeat='game in games' value='{{ game._id }}') {{ game.title }}
                             a.btn.btn-primary(type='button', ng-click='createActivity()')
                                 span.glyphicon.glyphicon-plus.right10
                                 | New activity
+                            p.btn-danger {{activityCreatedError}}
                     p.btn-danger {{activityOpenedError}}
                     table.table.table-hover
                         thead
diff --git a/app/views/gameActivity.jade b/app/views/gameActivity.jade
index 183f460..faef8b5 100644
--- a/app/views/gameActivity.jade
+++ b/app/views/gameActivity.jade
@@ -28,14 +28,15 @@ block content
                         .panel-heading Create a new Activity
                         .panel-body
                             label Activity title:
-                                input.form-control(type='text' ng-model='activity.name')
+                                input.form-control(placeholder='New Activity' type='text' ng-model='activity.name')
                             label Class:
                                 select.form-control(ng-controller='AppCtrl' ng-model='activity.classId')
                                     option(ng-repeat='class in classes' value='{{ class._id }}') {{ class.name }}
                             a.btn.btn-primary(type='button', ng-click='createActivity()')
                                 span.glyphicon.glyphicon-plus.right10
                                 | New activity
-                        p.btn-danger {{activityOpenedError}}
+                            p.btn-danger {{activityCreatedError}}
+                    p.btn-danger {{activityOpenedError}}
                     table.table.table-hover
                         thead
                             tr
diff --git a/app/views/home.jade b/app/views/home.jade
index 290c143..5a699b6 100644
--- a/app/views/home.jade
+++ b/app/views/home.jade
@@ -26,7 +26,7 @@ block content
                         .panel-heading Create a new Activity
                         .panel-body
                             label Activity name:
-                                input.form-control(type='text' ng-model='activity.name')
+                                input.form-control(placeholder='New Activity' type='text' ng-model='activity.name')
                             label Game:
                                 select.form-control(ng-model='activity.gameId')
                                     option(ng-repeat='game in games' value='{{ game._id }}') {{ game.title }}
@@ -36,6 +36,7 @@ block content
                             a.btn.btn-primary(type='button', ng-click='createActivity()')
                                 span.glyphicon.glyphicon-plus.right10
                                     | New activity
+                            p.btn-danger {{activityCreatedError}}
                     p.btn-danger {{activityOpenedError}}
                     table.table.table-hover
                         thead
@@ -73,7 +74,7 @@ block content
                         .panel-heading Create a new Game
                         .panel-body
                             label Game title:
-                                input.form-control(type='text' ng-model='game.gameTitle')
+                                input.form-control(placeholder='New Game' type='text' ng-model='game.gameTitle')
                             a.btn.btn-primary(align='center' type='button', ng-click='createGame()')
                                 span.glyphicon.glyphicon-plus.right10
                                 | New game
@@ -102,7 +103,7 @@ block content
                         .panel-heading Create a new Class
                         .panel-body
                             label Class title:
-                                input.form-control(type='text' ng-model='class.name')
+                                input.form-control(placeholder='New Class' type='text' ng-model='class.name')
                             a.btn.btn-primary(type='button', ng-click='createClass()')
                                 span.glyphicon.glyphicon-plus.right10
                                 | New class