Implement flag arrays
This commit is contained in:
parent
3056a19d09
commit
dbf1985d25
6 changed files with 90 additions and 8 deletions
|
@ -171,6 +171,10 @@ angular.module("FICApp", ["ngRoute", "ngSanitize"])
|
|||
angular.forEach(exercice.flags, function(flag, fid) {
|
||||
if ($scope.my && $scope.my.exercices[eid] && $scope.my.exercices[eid].flags[fid] && $scope.my.exercices[eid].flags[fid].value !== undefined)
|
||||
data.exercices[eid].flags[fid].value = $scope.my.exercices[eid].flags[fid].value;
|
||||
if ($scope.my && $scope.my.exercices[eid] && $scope.my.exercices[eid].flags[fid] && $scope.my.exercices[eid].flags[fid].values !== undefined)
|
||||
data.exercices[eid].flags[fid].values = $scope.my.exercices[eid].flags[fid].values;
|
||||
else
|
||||
data.exercices[eid].flags[fid].values = [""];
|
||||
});
|
||||
});
|
||||
angular.forEach(data.exercices, function(exercice, eid) {
|
||||
|
@ -270,6 +274,10 @@ angular.module("FICApp", ["ngRoute", "ngSanitize"])
|
|||
var cbs;
|
||||
var cbd;
|
||||
|
||||
$scope.additem = function(key) {
|
||||
key.values.push("");
|
||||
};
|
||||
|
||||
$scope.ssubmit = function() {
|
||||
var resp = {}
|
||||
var check = undefined
|
||||
|
@ -279,6 +287,22 @@ angular.module("FICApp", ["ngRoute", "ngSanitize"])
|
|||
{
|
||||
resp["flags"] = {};
|
||||
angular.forEach($scope.my.exercices[$rootScope.current_exercice].flags, function(flag,kid) {
|
||||
if (flag.values !== undefined) {
|
||||
if (flag.separator) {
|
||||
for (var i = flag.values.length - 1; i >= 0; i--) {
|
||||
if (!flag.values[i].length)
|
||||
flag.values.splice(i, 1);
|
||||
}
|
||||
|
||||
flag.value = flag.values.join(flag.separator) + flag.separator;
|
||||
|
||||
if (flag.values.length == 0)
|
||||
flag.values = [""];
|
||||
}
|
||||
else
|
||||
flag.value = flag.values[0];
|
||||
}
|
||||
|
||||
if (flag.found == null) {
|
||||
if (flag.soluce !== undefined) {
|
||||
if (check === undefined) check = true;
|
||||
|
|
Reference in a new issue