Skip to content

Commit 5062ae1

Browse files
sventhielsventhiel
committed
Merge branch 'rc' of https://github.com/BEXIS2/Core into rc
2 parents afd0665 + 406ed33 commit 5062ae1

File tree

39 files changed

+534
-4019
lines changed

39 files changed

+534
-4019
lines changed

‎Components/Utils/BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public void GenerateSeedData()
4040

4141
var o12 = operationManager.Find("Shell", "Settings", "*") ?? operationManager.Create("Shell", "Settings", "*", settings);
4242

43-
if (!versionManager.Exists("Shell", "2.18.2"))
43+
if (!versionManager.Exists("Shell", "3.0.0-beta"))
4444
{
45-
versionManager.Create("Shell", "2.18.2");
45+
versionManager.Create("Shell", "3.0.0-beta");
4646
}
4747
}
4848
}

‎Console/BExIS.Web.Shell.Svelte/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
},
5252
"type": "module",
5353
"dependencies": {
54-
"@bexis2/bexis2-core-ui": "^0.3.8",
54+
"@bexis2/bexis2-core-ui": "^0.3.9",
5555
"@sveltejs/adapter-static": "^2.0.1",
5656
"patch-package": "^6.5.1",
5757
"svelte-collapsible": "^0.2.2",

‎Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
},
4949
"type": "module",
5050
"dependencies": {
51-
"@bexis2/bexis2-core-ui": "^0.3.8",
51+
"@bexis2/bexis2-core-ui": "^0.3.9",
5252
"@bexis2/bexis2-rpm-ui": "^0.1.0",
5353
"@floating-ui/dom": "^1.4.1",
5454
"@fortawesome/free-solid-svg-icons": "^6.4.0",

‎Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<Compile Include="Controllers\Legacy\AttachmentsController.cs" />
6969
<Compile Include="Controllers\Hooks\EntityReferenceController.cs" />
7070
<Compile Include="Controllers\FormController.cs" />
71+
<Compile Include="Controllers\Legacy\CreateDatasetController.cs" />
7172
<Compile Include="Controllers\Legacy\HelpController.cs" />
7273
<Compile Include="Controllers\Legacy\ImportMetadataStructureController.cs" />
7374
<Compile Include="Controllers\Legacy\ImportMetadataStructureReadSourceController.cs" />
@@ -442,7 +443,6 @@
442443
</Content>
443444
<Content Include="Views\Shared\_errorMessages.cshtml" />
444445
<Content Include="Views\Shared\_summaryErrorMessages.cshtml" />
445-
<Content Include="Views\CreateDataset\Index.cshtml" />
446446
<Content Include="Views\Form\MetadataEditor.cshtml" />
447447
<Content Include="Views\Form\_metadataAttributeView.cshtml" />
448448
<Content Include="Views\Form\_metadataCompoundAttributeUsageView.cshtml" />
@@ -469,35 +469,15 @@
469469
<Content Include="Views\Submit\_taskListView.cshtml" />
470470
<Content Include="Views\Submit\_uploadWizardNav.cshtml" />
471471
<Content Include="Views\Submit\_useTemplateView.cshtml" />
472-
<Content Include="Views\SubmitChooseUpdateMethod\ChooseUpdateMethod.cshtml" />
473-
<Content Include="Views\SubmitGetFileInformation\GetFileInformation.cshtml" />
474-
<Content Include="Views\SubmitGetFileInformation\_txtFormularView.cshtml" />
475-
<Content Include="Views\SubmitGetFileInformation\_xlsFormularView.cshtml" />
476-
<Content Include="Views\SubmitSpecifyDataset\SpecifyDataset.cshtml" />
477-
<Content Include="Views\SubmitSpecifyDataset\_selectADatasetId.cshtml" />
478-
<Content Include="Views\SubmitSummary\Summary.cshtml" />
479-
<Content Include="Views\SubmitUnstructuredData\UnstructuredData.cshtml" />
480-
<Content Include="Views\SubmitValidation\Validation.cshtml" />
481472
<Content Include="Views\Shared\_EntitySelectorInWindowView.cshtml" />
482473
<Content Include="Views\Shared\_EntitySelectorView.cshtml" />
483-
<Content Include="Views\SubmitSelectAFile\SelectAFile.cshtml" />
484-
<Content Include="Views\EasyUploadSelectAFile\SelectAFile.cshtml" />
485-
<Content Include="Views\EasyUploadSheetDataStructure\SheetDataStructure.cshtml" />
486-
<Content Include="Views\EasyUploadSheetSelectMetaData\SheetSelectMetaData.cshtml" />
487-
<Content Include="Views\EasyUploadSummary\EasyUploadSummary.cshtml" />
488-
<Content Include="Views\EasyUploadVerification\Verification.cshtml" />
489-
<Content Include="Views\EasyUpload\UploadWizard.cshtml" />
490-
<Content Include="Views\EasyUpload\_taskListView.cshtml" />
491-
<Content Include="Views\EasyUpload\_uploadWizardNav.cshtml" />
492-
<Content Include="Views\EasyUploadSelectAreas\SelectAreas.cshtml" />
493474
<Content Include="Views\Test\Index.cshtml" />
494475
<Content Include="Views\Form\MetadataEditorOffline.cshtml" />
495476
<Content Include="Views\Form\_metadataCompoundAttributeViewOffline.cshtml" />
496477
<Content Include="Views\Form\_metadataCompoundAttributeUsageViewOffline.cshtml" />
497478
<Content Include="Views\Form\_metadataAttributeViewOffline.cshtml" />
498479
<Content Include="Views\Attachments\Index.cshtml" />
499480
<Content Include="Views\Attachments\_datasetAttachements.cshtml" />
500-
<Content Include="Views\EasyUploadVerification\Row.cshtml" />
501481
<Content Include="Views\EntityReference\Index.cshtml" />
502482
<Content Include="Views\EntityReference\_create.cshtml" />
503483
<Content Include="Views\EntityReference\Show.cshtml" />

‎Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/Legacy/CreateDatasetController.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -541,9 +541,7 @@ public long SubmitDataset(bool valid, string entityname)
541541
{
542542
TaskManager = (CreateTaskmanager)Session["CreateDatasetTaskmanager"];
543543

544-
if (TaskManager.Bus.ContainsKey(CreateTaskmanager.DATASTRUCTURE_ID)
545-
&& TaskManager.Bus.ContainsKey(CreateTaskmanager.RESEARCHPLAN_ID)
546-
&& TaskManager.Bus.ContainsKey(CreateTaskmanager.METADATASTRUCTURE_ID))
544+
if (TaskManager.Bus.ContainsKey(CreateTaskmanager.METADATASTRUCTURE_ID))
547545
{
548546
// for e new dataset
549547
if (!TaskManager.Bus.ContainsKey(CreateTaskmanager.ENTITY_ID))

‎Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ public void GenerateSeedData()
316316
entityTemplate.MetadataFields = new List<int>() { 4, 1 };
317317
entityTemplate.HasDatastructure = true;
318318
entityTemplate.DatastructureList = new List<long>();
319+
entityTemplate.AllowedFileTypes = new List<string> { ".csv" };
319320

320321
// set entity
321322
entityTemplate.EntityType = entity;

‎Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/Attachments/_datasetAttachements.cshtml‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -23,48 +23,7 @@
2323
}
2424
<table>
2525
<tr>
26-
@if (Model.UploadAccess)
27-
{
28-
<td style="width:50%;border-top: #9B9B9B solid thin; border-bottom: #9B9B9B solid thin; padding: 12pt 0 12pt 0; vertical-align: top;padding-left:20px">
29-
<div id="upload_files">
30-
<h3></h3>
31-
<div class="push_Header stepper">
32-
<h3>Attach files to this dataset</h3>
33-
</div>
34-
<div class="push_Description stepper">
35-
<p>You can select one or multiple files. Please provide a short description for your selected file(s).</p>
36-
<p>
37-
Note: Depending on your network connection the upload may take some time. Please stay patient.
38-
</p>
39-
<p>Maximum file size: @mbMax MB</p>
40-
<p>Maximum file name length: @maxFileNameLength </p>
41-
</div>
42-
43-
@using (Html.BeginForm("ProcessSubmit", "Attachments", new { area = "Dcm", datasetId = datasetId },
44-
FormMethod.Post, new { id = "uploadForm", enctype = "multipart/form-data" }))
45-
{
46-
<div style="display:inline-block;width:50%">
47-
<span style="font-weight:bold">Description:</span><br />
48-
<textarea style="max-width: 100%; min-width: 80%;" name="description" rows="4"></textarea>
49-
</div>
50-
<div style="display:inline-block;width:40%">
51-
<span style="font-weight:bold">Files:</span><br />
52-
@(Html.Telerik().Upload()
53-
.Name("attachments-upload")
54-
.Multiple(true)
55-
.ShowFileList(true)
56-
.ClientEvents(events => events
57-
.OnSelect("Push_OnSelect")
58-
.OnRemove("Push_OnRemove")
59-
))
60-
<br />
61-
<button id="push_submitBt" type="submit" value="Upload" class="bx-button function bx-disabled" disabled="disabled">Upload</button>
62-
</div>
63-
}
64-
</div>
6526

66-
</td>
67-
<td style="width: 20pt; border: none"></td> }
6827
<td style="border-top: #9B9B9B solid thin; border-bottom: #9B9B9B solid thin; padding: 12pt 0 12pt 0;min-width:300px; vertical-align: top; padding-left: 20px;">
6928
<div id="view_files">
7029
<div id="FileList" class="bx-trunc-parent">

0 commit comments

Comments
 (0)