Sprint10

.gitignore

@@ -1,6 +1,3 @@
 node_modules
 database/user.sqlite
 .DS_Store
-model.js
-underscore.js
-utils.js

app/common.js

@@ -9,11 +9,15 @@ requirejs.config({
         xlsx: {
             deps: ['jszip'],
             exports: "XLSX"
+        },
+        "jquery-ui": {
+          deps: ['jquery']
         }
     },
     paths: {
       app: "../app",
       jquery : "jquery/dist/jquery.min",
+      "jquery-ui": "jquery-ui/jquery-ui",
       bootstrap :  "../lib/bootstrap.min",
       sqlite : "../lib/sql",
       xlsx : "xlsx/xlsx",

app/config.js

@@ -38,15 +38,19 @@ define(function (require) {
 		DATABASE_USER: addDirectory() + "/database/user.sqlite",
 		/* Standard database when no user database is present */
 		DATABASE_SLIMSTAMPEN: addDirectory() + "/database/slimstampen.sqlite",
-		ALGORITHM: "flashcard", // flashcard; slimstampen;
-		LANGUAGE: "en",
+		ALGORITHM: "slimstampen", // flashcard; slimstampen;
+		ENGLISH: 1, // id of the english language
 		ONLINE_HOST: "db4free.net",
 		ONLINE_USER: "enricdz148_slim",
 		ONLINE_DATABASE: "enricdz148_slim",
 		ONLINE_PASSWORD: "exVhqZJas",
 		MESSAGES: "#messages",
 		ERRORS: "#errors",
-		CONTACT: "[email protected]"
+		CONTACT: "[email protected]",
+		CONTACT_NOREPLY: "[email protected]",
+		/* Strength bar percentage colour limits */
+		STRENGTH_RED_UPPERLIMIT: 20,
+		STRENGTH_GREEN_LOWERLIMIT: 60
 	};
 
 	return {

app/create.js

@@ -35,18 +35,18 @@ define(['app/lang', 'app/string', 'app/config', 'app/database', 'jquery', 'boots
 		formItemId++;
 	}
 
-	// Function for showing the user the system is loading
-	function showLoading(onSuccess) {
-		$("#loadFrame").children("h1").html(lang("create_busycreating"));
-		$("#loadFrame").fadeIn(300, onSuccess);
+	function saveDatasetOnline(data, form, subject) {
+		db.executeQuery("addDataset", data, false, true, function(id) {
+			data.unshift(id);
+			saveDatasetsLocal(data, form, subject);
+		});
 	}
 
-	function saveDatasetsLocal(data, form) {
+	function saveDatasetsLocal(data, form, subject) {
 		db.executeQuery("addDatasetAll", data, true, false);
 		db.close();
 
 		var language = forms.getFormVal(form, "select", "language");
-		var subject = forms.getFormVal(form, "select", "subject");
 		window.location = "index.html?message=success_createdataset&language="+language+"&subject="+subject;
 	}
 
@@ -59,6 +59,10 @@ define(['app/lang', 'app/string', 'app/config', 'app/database', 'jquery', 'boots
 		$("#inputquestion").prop("placeholder", lang("label_question"));
 		$("#inputanswer").prop("placeholder", lang("label_answer"));
 		$("#inputhint").prop("placeholder", lang("label_hint"));
+		$("#popoverSubject").prop("title", lang("label_subject"));
+		$("#popoverSubject").data("content", lang("tutorial_datasetsubject"));
+		$("#popoverLanguage").prop("title", lang("label_language"));
+		$("#popoverLanguage").data("content", lang("tutorial_datasetlanguage"));
 	}
 	// Replace user data in view from database
 	$("span[data-replace]").each(function() {
@@ -67,8 +71,40 @@ define(['app/lang', 'app/string', 'app/config', 'app/database', 'jquery', 'boots
 		$(this).html(text);
 	});
 
+	function handleCustomSubject() {
+		window.Parsley.addValidator('subjectName', {
+			validateString: function(value, requirement) {
+				var result = db.getQuery("getSubjectByName", [value]);
+				return result.length === 0;
+			},
+			messages: {
+				en: lang("error_subjectnamenotunique")
+			}
+		});
+
+		// Display the input for custom subject only if appropriate
+		$("#datasetsubject").change(function() {
+			var id = parseInt(forms.getFormVal("#createForm", "select", "subject"));
+			$("#datasetsubject").data("subject", id);
+
+			if (id === 0) {
+				$("#newsubject").attr("hidden", false);
+				$("#customsubject").attr("required", "");
+				$("#customsubject").attr("data-parsley-subject-name", "1");
+			} else {
+				$("#newsubject").attr("hidden", true);
+				$("#customsubject").removeAttr("required");
+				$("#customsubject").removeAttr("data-parsley-subject-name");
+			}
+		});
+	}
+
 	ready.on(function() {
 		localisePage();
+		handleCustomSubject();
+
+		$('#popoverSubject').popover();
+		$('#popoverLanguage').popover();
 		// Add the first element
 		addElementToForm();
 		$(".add").click(function() {
@@ -88,10 +124,11 @@ define(['app/lang', 'app/string', 'app/config', 'app/database', 'jquery', 'boots
 		var form = "#createForm";
 		forms.initialize(form);
 		forms.onSuccess(form, function() {
-			showLoading(function() {
+			ready.showLoading(lang("create_busycreating"), function() {
+				var form = "#createForm";
 				var name = forms.getFormVal(form, "input", "name");
 	      var language = forms.getFormVal(form, "select", "language");
-	      var subject = forms.getFormVal(form, "select", "subject");
+	      var subject = parseInt($("#datasetsubject").data("subject"));
 	      var user_id = user.getCookie('user_id');
 	      var currentdate = date.formatDatetime(new Date(), true);
 
@@ -104,13 +141,24 @@ define(['app/lang', 'app/string', 'app/config', 'app/database', 'jquery', 'boots
 					dataset_items.push({"id": i, "text": question, "answer": answer, "hint": hint});
 				}
 				dataset_items = JSON.stringify(dataset_items);
+				ready.changeLoadMessage(lang("create_adding_items"));
 	      if (db.online()) {
-	        db.executeQuery("addDataset", [user_id, name, language, subject, 0, 0, 1, currentdate, currentdate, dataset_items], false, true);
-	        db.lastInsertIdOnline('tbldatasets', 'dataset_id', function (id) {
-						saveDatasetsLocal([id, user_id, name, language, subject, 0, 0, 1, currentdate, currentdate, dataset_items], form);
-	        });
+					if (subject === 0) {
+						var newsubjectname = $("#customsubject").val();
+						db.executeQuery("addSubjectOnline", [newsubjectname, user.getCookie("user_id"), 1], false, true, function(subject_id) {
+							db.executeQuery("addSubject", [subject_id, newsubjectname, user.getCookie("user_id"), 1], true, false);
+							saveDatasetOnline([user_id, name, language, subject_id, 0, 0, 1, currentdate, currentdate, dataset_items,'[]'], form, subject_id);
+						});
+					} else {
+						saveDatasetOnline([user_id, name, language, subject, 0, 0, 1, currentdate, currentdate, dataset_items,'[]'], form, subject);
+					}
 	      } else {
-	        saveDatasetsLocal([null, user_id, name, language, subject, 0, 0, 0, currentdate, currentdate, dataset_items], form);
+					if (subject === 0) {
+						subject = db.lastInsertRowId("tblsubjects", "subject_id") + 1;
+						var newsubjectname = $("#customsubject").val();
+						db.executeQuery('addSubject' , [subject, newsubjectname, user.getCookie("user_id"), 0]);
+					}
+	        saveDatasetsLocal([null, user_id, name, language, subject, 0, 0, 0, currentdate, currentdate, dataset_items,'[]'], form, subject);
 	      }
 			});
 		});