done and close #54

Author: EleonoraPetzold

Content/main.css

@@ -6,13 +6,20 @@
     margin-bottom: 1em;
 }
 
+
 .dtm-para_green {
     background-color: #bbddd9;
     font-size: 14px;
     padding: 0.5em;
 }
 
-.dtm-divBox .dtm-controls {
+.dtm-para-warning {
+    background-color: #FFE6BE;
+    font-size: 14px;
+    padding: 0.5em;
+}
+
+.dtm-divBox .dtm-controls  {
     display: flex;
     flex-wrap: wrap;
     padding: 0.1em 0.5em;

Controllers/LUICalculationController.cs

@@ -126,7 +126,7 @@ public ActionResult CalculateLUI(LUIQueryModel model)
 
             Session["DataStructureId"] = null;
 
-            if (model.ComponentsSet.SelectedValue == "old components set")
+            if (model.ComponentsSet.SelectedValue == "historic components set")
             {
                 selectedDataStructureId = (int)Models.Settings.get("lui:datastructureOldComponentsSet");
                 model.DownloadDatasetId = Models.Settings.get("lui:datasetOldComponentsSet").ToString();
@@ -145,10 +145,10 @@ public ActionResult CalculateLUI(LUIQueryModel model)
             string dsId = "";
             switch (model.ComponentsSet.SelectedValue)
             {
-                case "old components set":
+                case "historic components set":
                     dsId = Models.Settings.get("lui:datasetOldComponentsSet").ToString();
                     break;
-                case "new components set":
+                case "default components set":
                     dsId = Models.Settings.get("lui:datasetNewComponentsSet").ToString();
                     break;
             }
@@ -323,7 +323,7 @@ public ActionResult DownloadFile(string mimeType)
             }
 
             string datasetId;
-            if (model.ComponentsSet.SelectedValue.Contains("old"))
+            if (model.ComponentsSet.SelectedValue.Contains("historic"))
                 datasetId = Models.Settings.get("lui:datasetOldComponentsSet").ToString();
             else
                 datasetId = Models.Settings.get("lui:datasetNewComponentsSet").ToString();

Models/LUIQueryModel.cs

@@ -55,8 +55,8 @@ public LUIQueryModel()
             MissingComponentData = new List<MissingComponentData>();
 
             //fill ComponentsSet
-            ComponentsSet.SelectedValue = "new components set";
-            ComponentsSet.Values = new List<string>() { "old components set", "new components set" };
+            ComponentsSet.SelectedValue = "default components set";
+            ComponentsSet.Values = new List<string>() { "historic components set", "default components set" };
 
 
             // fill RawVsCalc

Scripts/lui.js

@@ -41,7 +41,7 @@
             console.log(datasetIdOld);
             console.log(selecteddataset);
 
-            if (selecteddataset == "old components set") {
+            if (selecteddataset == "historic components set") {
 
                 datasetId = datasetIdOld;
                 console.log("old");

Views/LUICalculation/Index.cshtml

@@ -23,7 +23,7 @@
                 @if (Model.MissingComponentData.Count() != 0 && Model.IsPublicAccess == false)
                 {
                     <div class="dtm-divBox">
-                        <p class="dtm-para_green">Warning: Some input data needed for calculation is not completely available. Below you will find the affected years, and for which plots the data is missing. For this year, use the LUI just for testing purposes. For publications, use only LUI where no warning is given.</p>
+                        <p class="dtm-para-warning"><b>Warning:</b> Some input data needed for calculation is not completely available. Below you will find the affected years, and for which plots the data is missing. For this year, use the LUI just for testing purposes. For publications, use only LUI where no warning is given.</p>
 
                         <div class="dtm-controls">
 
@@ -68,7 +68,7 @@
                     </div>
                 }
                 <div id="divQuery00" class="dtm-divBox">
-                    <p class="dtm-para_green">Which input data do you want to use for the calculation (default = new set).</p>
+                    <p class="dtm-para_green">Which input data do you want to use for the calculation. See "LUI changes docu" above for more information.</p>
                     <div class="dtm-controls">
                         @foreach (var item in Model.ComponentsSet.Values)
                         {