[M] moved manual assessment

predihood/classes/Data.py

@@ -313,11 +313,8 @@ class Data:
         else: self.data.to_csv(self.dataset_path, index=None)  # index=None: avoid line numbering
 
     def add_manually_assessed_iris(self):
-        print("ADD MANUAL ASSESSMENT")
         manually_assessed_iris = pd.read_csv(FILE_MANUAL_ASSESSMENT_EXPERTS, header=0)
-        print(len(self.data))
         self.data = self.data.append(manually_assessed_iris)
-        print(len(self.data))
         self.data["CODE"] = self.data["CODE"].astype(str)
         self.data.sort_values("CODE", inplace=True)
         self.fill_missing_values("median")

predihood/static/js/carto.js

@@ -104,87 +104,34 @@ function displayPopup(e) {
         divInformation.append(moreInfosLink);
     }
 
-
-    if($("#assessmentMode").is(":checked")) {
-        // alert("assessment mode");
-
-        for(let env in environment_variables) {
-            let env_values = environment_variables[env]
-            let div_container = $("<div>").prop("id", "assessment"+env)
-            let list_values = $("<select>");
-            for(let value in env_values) { list_values.append($("<option>").prop("value", env_values[value]).text(env_values[value])) }
-            div_container.append(env).append(list_values)
-            divInformation.append(div_container)
-        }
-
-        if($("#addAssessmentButton").length > 0) {
-            $("#addAssessmentButton").removeAttr("id"); // remove id to avoid duplicates (fix the miss of event on button)
-        }
-
-        let to_csv_button = $("<button>").prop("id", "addAssessmentButton");
-        if(preferred_language_carto === "french") {
-            to_csv_button.text("Ajouter au jeu de données");
-        } else {
-            to_csv_button.text("Add to dataset");
-        }
-
-        let messageTooltip = divInformation[0].outerHTML + to_csv_button[0].outerHTML;
-        layer.bindPopup(messageTooltip)
-        layer.bringToFront();
-        layer.openPopup();
-
-        $("#addAssessmentButton").on("click", function() {
-            let data_param = {}
-            for(let env in environment_variables) {
-                data_param[env] = $("#assessment"+env)[0].children[0].value
-            }
-            data_param["code_iris"] = code_iris
-            console.log(data_param)
-            $.ajax({
-                type: "GET",
-                url: "/add_iris_to_csv",
-                data: data_param,
-                "async": false,
-                contentType: 'application/json;charset=UTF-8',
-                success: function(result) {
-                    alert(result)
-                },
-                error: function(result, textStatus, errorThrown) {
-                    console.log(errorThrown);
-                }
-            });
-        });
+    if (selected_algorithm !== "undefined" && selected_algorithm !== undefined) {
+        predictions = predict(code_iris, selected_algorithm)
+        console.log(predictions)
     }
-    else {
-        if (selected_algorithm !== "undefined" && selected_algorithm !== undefined) {
-            predictions = predict(code_iris, selected_algorithm)
-            console.log(predictions)
-        }
 
-        let selectAlgorithm = $("<select>")
-        selectAlgorithm
-            .prop("id", "selectAlgorithmTooltip")
-            .append($("<option>").prop("value", "undefined").text("---"))
+    let selectAlgorithm = $("<select>")
+    selectAlgorithm
+        .prop("id", "selectAlgorithmTooltip")
+        .append($("<option>").prop("value", "undefined").text("---"))
 
-        for(let algorithm of classifiers) {
-           selectAlgorithm.append($("<option>").prop("value", algorithm).text(algorithm));
-        }
-        previously_selected_algorithm = selected_algorithm;
+    for(let algorithm of classifiers) {
+       selectAlgorithm.append($("<option>").prop("value", algorithm).text(algorithm));
+    }
+    previously_selected_algorithm = selected_algorithm;
 
-        let divPredictions = $("<div>").prop("id", "divPredictions")
-        if(predictions !== undefined) {
-            for(let key in predictions) { divPredictions.append(capitalizeFirstLetter(key.split("_").join(" "))+': ' + predictions[key]["most_frequent"] + " (" + predictions[key]["count_frequent"] + "/7)").append($('<br>')); }
-        }
+    let divPredictions = $("<div>").prop("id", "divPredictions")
+    if(predictions !== undefined) {
+        for(let key in predictions) { divPredictions.append(capitalizeFirstLetter(key.split("_").join(" "))+': ' + predictions[key]["most_frequent"] + " (" + predictions[key]["count_frequent"] + "/7)").append($('<br>')); }
+    }
 
-        let messageTooltip = divInformation[0].outerHTML + selectAlgorithm[0].outerHTML + divPredictions[0].outerHTML;
-        console.log(messageTooltip)
-        layer.bindPopup(messageTooltip)
-        layer.bringToFront();
-        layer.openPopup();
+    let messageTooltip = divInformation[0].outerHTML + selectAlgorithm[0].outerHTML + divPredictions[0].outerHTML;
+    console.log(messageTooltip)
+    layer.bindPopup(messageTooltip)
+    layer.bringToFront();
+    layer.openPopup();
 
-        $("#selectAlgorithmTooltip").val(previously_selected_algorithm); // must be after binding the popup to be effective
-        $("#selectAlgorithmTooltip").on("click", function() { displayPopup(e)}) // update popup (env variables) when click on an algorithm
-    }
+    $("#selectAlgorithmTooltip").val(previously_selected_algorithm); // must be after binding the popup to be effective
+    $("#selectAlgorithmTooltip").on("click", function() { displayPopup(e)}) // update popup (env variables) when click on an algorithm
 }
 
 /**

predihood/templates/form.html

@@ -55,14 +55,6 @@
   <br>
 </div>
 
-<div>
-    {% if language == "french" %}
-        Expertise manuelle: <input type="checkbox" id="assessmentMode"/>
-    {% else %}
-        Manual assessment: <input type="checkbox" id="assessmentMode"/>
-    {% endif %}
-</div>
-
 <div class="input-group mb-3">
     <button class="btn" type="button" id="boutonEffacer">
         {% if language == "french" %}