From fcee1ec7c84e7858c06ed3764eed69cd01848a41 Mon Sep 17 00:00:00 2001 From: Youssef ABIDI Date: Mon, 28 Aug 2017 10:25:28 +0100 Subject: [PATCH] fixing question display + answers sending --- src/app/pages/viewer/ViewerPageCtrl.js | 31 ++++++++++++- src/app/pages/viewer/viewer.html | 46 +++++++++++-------- src/app/pages/viewer/viewer.module.js | 2 +- .../baWizard/baWizardStep.directive.js | 31 ++++++++++++- 4 files changed, 86 insertions(+), 24 deletions(-) diff --git a/src/app/pages/viewer/ViewerPageCtrl.js b/src/app/pages/viewer/ViewerPageCtrl.js index a3fffd2..7915a30 100644 --- a/src/app/pages/viewer/ViewerPageCtrl.js +++ b/src/app/pages/viewer/ViewerPageCtrl.js @@ -21,8 +21,27 @@ vm.surveys = data; $log.info("Got the survey data",data); vm.survey = getSurvey(); - console.log(vm.surveys); - console.log(vm.survey); + //building forms elements + vm.forms = []; + angular.forEach(vm.survey.elements, function(element, key) { + + angular.forEach(vm.survey.list.members, function(member, key) { + if(member._id != vm.activeMemberId) { + vm.forms[member._id] = {}; + //vm.forms[member._id].$element_id = false; + /*var form = []; + form[element._id] = []; + vm.forms.push(form); + var input = []; + input[element._id] = false; + vm.forms[member._id].push(input);*/ + } + + //.push(k + ': ' + member); + }); + }); + console.log(vm.survey); + console.log(vm.forms); }, function (error){ $log.error(error); }); @@ -38,11 +57,19 @@ function activate(){ vm.surveys = []; vm.survey = []; + vm.activeMemberId = $stateParams.member_id; loadSurveys(); + console.log(vm.activeMemberId) } + vm.submit = function(form){ + //$scope.submitted = true; + alert("Angular is Awesome!!!"); + console.log('submit', form); + }; + activate(); diff --git a/src/app/pages/viewer/viewer.html b/src/app/pages/viewer/viewer.html index 1c8a571..3d25441 100644 --- a/src/app/pages/viewer/viewer.html +++ b/src/app/pages/viewer/viewer.html @@ -10,27 +10,33 @@

- + + +
+ +
+
+
+

{{ e.text }}

+ +

+
+ + +
+
+
+
+
+
+
+ +
-
-

{{ e.text }}

- -

-
- - -
-
-
- -
- -
diff --git a/src/app/pages/viewer/viewer.module.js b/src/app/pages/viewer/viewer.module.js index cfb368f..0227a92 100644 --- a/src/app/pages/viewer/viewer.module.js +++ b/src/app/pages/viewer/viewer.module.js @@ -12,7 +12,7 @@ function routeConfig($stateProvider) { $stateProvider .state('viewer', { - url: '/viewer/:survey_id', + url: '/viewer/:survey_id/:member_id', title: 'Viewer', templateUrl: 'app/pages/viewer/viewer.html', controller: 'ViewerPageCtrl as vm', diff --git a/src/app/theme/components/baWizard/baWizardStep.directive.js b/src/app/theme/components/baWizard/baWizardStep.directive.js index 126dbd9..2c40708 100644 --- a/src/app/theme/components/baWizard/baWizardStep.directive.js +++ b/src/app/theme/components/baWizard/baWizardStep.directive.js @@ -5,7 +5,7 @@ .directive('baWizardStep', baWizardStep); /** @ngInject */ - function baWizardStep() { + function baWizardStep($http) { return { restrict: 'E', transclude: true, @@ -38,7 +38,36 @@ } function submit() { + var apiBaseUrl = "http://localhost:9000" + var endpoint = apiBaseUrl + "/answers"; + $scope.form && $scope.form.$setSubmitted(true); + if($scope.form && $scope.form.$invalid == false) { + //console.log("inner", $scope.form.innerForm); + angular.forEach($scope.form.innerForm, function(val, key) { + if((key.indexOf("_") !== -1) && (key.indexOf("_comment") == -1)) { + var res = key.split("_"); + //console.log("res", res); + //console.log("val", val); + var commentKey = key + "_comment"; + var answer = { + "value" : val.$viewValue, + "comment" : $scope.form.innerForm[commentKey].$viewValue, + "survey" : res[0], + "memberEvaluated" : res[1], + "memberAsked" : res[2] + } + console.log(answer); + /*$http.post(endpoint, answer).success(function(data) { + console.log(data.data); + //return response.data; + }).error(function(msg, code) { + //deferred.reject(msg); + });*/ + } + }) + + } } function isComplete() {