#779 its now possible to activate the data aggreements by public data

Author: DavidBlaa

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/src/routes/search/+page.svelte

@@ -16,5 +16,6 @@
 	contentLayoutType={pageContentLayoutType.full}
 	{links}
 >
+<h1>eric is cool</h1>
 	<Search {controller} />
 </Page>

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Controllers/DataController.cs

@@ -171,6 +171,7 @@ public ActionResult ShowData(long id, int version = 0, bool asPartial = false, s
                 ViewData["use_minor"] = moduleSettings.GetValueByKey("use_minor");
                 ViewData["check_public_metadata"] = moduleSettings.GetValueByKey("check_public_metadata");
                 ViewData["has_data"] = false;
+                ViewData["data_aggreement"] = moduleSettings.GetValueByKey("data_aggreement");
                 Session["Filter"] = null;
 
                 Dataset researcobject = dm.GetDataset(id);

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Ddm.Settings.json

@@ -45,6 +45,18 @@
       "type": "Boolean",
       "description": "If set to true, the minor version tag can be assigned to dataset versions to display changes in more detail."
     },
+    {
+      "key": "data_aggreement",
+      "title": "Data Aggreement by download",
+      "value": "none",
+      "description": "Set up  if user need to aggree the data aggreements before download and where the aggreement is writen.",
+      "type": "String",
+      "options": [
+        "none",
+        "data policy",
+        "terms and conditions"
+      ]
+    },
     {
       "key": "citationSettings",
       "title": "settings for citations",
@@ -56,7 +68,7 @@
         "numberOfAuthors": 0,
         "showCitation": true,
         "defaultViewCitationFormat": "Text",
-        "viewCitationFormats": ["Text", "APA"],
+        "viewCitationFormats": [ "Text", "APA" ],
         "downloadCitationFormats": [ "Text", "APA", "RIS", "BibTex" ]
       },
       "description": "..."

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Views/Data/ShowData.cshtml

@@ -10,6 +10,8 @@
     string bioSchemaInfos = "";
     long total = 0;
     bool has_data = false;
+    string data_aggreement = "none";
+    bool aggrreement_checked = true;
 
     if (ViewData["TabIndex"] != null)
     {
@@ -41,6 +43,14 @@
         has_data = (bool)ViewData["has_data"];
     }
 
+    if (ViewData["data_aggreement"] != null && String.IsNullOrEmpty(User.Identity.Name))
+    {
+        data_aggreement = (string)ViewData["data_aggreement"];
+        if (data_aggreement != "none") {
+            aggrreement_checked = false;
+        }
+    }
+
     var show_tabs = new Dictionary<string, string>();
     bool check_public_metadata = false;
 
@@ -234,10 +244,32 @@
             @{Html.RenderAction("GetCitationOrTitle", "Data", new { datasetVersionId = Model.VersionId });}
         </div>
 
-        <div class="datasetview_header-toggle">
-
+        <div class="datasetview_header-toggle flex">
+           
             @if (Model.DownloadAccess)
             {
+                /*  data aggreement state: none, data policy, terms and conditions**/
+
+                if (data_aggreement.Equals("data policy"))
+                {
+                    <div class="data-aggreement">
+                        @Html.CheckBox("data_policy", false, new { @id = "data-policy" })
+                        <b>I accept the public regulations from the 
+                        <a href="/footer/policy" target="_blank">privacy policy</a>.</b>
+                    </div>
+                }
+                else if (data_aggreement.Equals("terms and conditions"))
+                {
+                    <div class="data-aggreement">
+                        @Html.CheckBox("terms_and_conditions", false, new { @id = "terms-and-conditions" })
+                        <b>
+                            I accept the public regulations from the
+                            <a href="/footer/termsandconditions" target="_blank">terms and conditions</a>.
+                        </b>
+                     </div>
+                }
+
+
 
                 if (Model.DataStructureType.ToLower().Equals("structured"))
                 {
@@ -279,9 +311,9 @@
                         {
                             <button id="sendRequestBt" class="bx-button small function bx-disabled" title="Send request to the owner of the dataset for the rights to see and download the primary data." disabled="disabled">Request Pending</button>
                         }
-                        else if(!has_data)
+                        else if (!has_data)
                         {
-                           <!-- if dataset has no data-->
+                            <!-- if dataset has no data-->
 
                         }
                         else
@@ -445,7 +477,7 @@
         </div>
     }
 </div>
-    <script type="text/javascript">
+<script type="text/javascript">
 
 	function grid_subjects_onDataBound() {
 		addTooltips();
@@ -480,8 +512,34 @@
 
         $("#preloaderContainer").removePreloader();
 
+        console.log("aggrreement_checked",'@aggrreement_checked')
+        setDownloadBt('@aggrreement_checked');
+
     });
 
+    function setDownloadBt(aggreed) {
+        console.log("aggreed",aggreed)
+
+        if (aggreed == 'true' || aggreed == 'True' || aggreed == true) {
+            $("#dropdownMenu1").removeAttr("disabled");
+            $("#dropdownMenu1").removeClass("bx-disabled")
+        }
+        else
+        {
+            $("#dropdownMenu1").attr("disabled", "disabled");
+            $("#dropdownMenu1").addClass("bx-disabled")
+        }
+        }
+
+      $("#data-policy").change(function () {
+        var isChecked = $(this).is(":checked");
+            setDownloadBt(isChecked);
+      });
+
+    $("#terms-and-conditions").change(function () {
+        var isChecked = $(this).is(":checked");
+        setDownloadBt(isChecked);
+    });
 
     function loadTags() {
             $.ajax({
@@ -632,7 +690,7 @@
        window.location.href = "/dcm/[email protected]";
 
     }
-    </script>
+</script>
 
 }
 else if (Model.IsPublic == false)
@@ -673,14 +731,17 @@ else
         float: right;
     }
 
+
     .tab-pane {
         min-height: 70px;
     }
 
-    .flex{
+    .flex {
         display: flex;
         flex-wrap: wrap;
         justify-content: space-between;
+        gap: 5px;
+        align-content: center;
     }
 
     .grow {
@@ -703,4 +764,8 @@ else
         padding-left:2px;
     }
 
+    .data-aggreement {
+        width:300px;
+    }
+
 </style>