Skip to content

Commit

Permalink
Merge branch 'rc' of https://github.com/BEXIS2/Core into rc
Browse files Browse the repository at this point in the history
  • Loading branch information
@sventhiel
sventhiel committed Dec 22, 2023
2 parents afd0665 + 406ed33 commit 5062ae1
Show file tree
Hide file tree
Showing 39 changed files with 534 additions and 4,019 deletions.
4 changes: 2 additions & 2 deletions Components/Utils/BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ public void GenerateSeedData()

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

if (!versionManager.Exists("Shell", "2.18.2"))
if (!versionManager.Exists("Shell", "3.0.0-beta"))
{
versionManager.Create("Shell", "2.18.2");
versionManager.Create("Shell", "3.0.0-beta");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Console/BExIS.Web.Shell.Svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"type": "module",
"dependencies": {
"@bexis2/bexis2-core-ui": "^0.3.8",
"@bexis2/bexis2-core-ui": "^0.3.9",
"@sveltejs/adapter-static": "^2.0.1",
"patch-package": "^6.5.1",
"svelte-collapsible": "^0.2.2",
Expand Down
2 changes: 1 addition & 1 deletion Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"type": "module",
"dependencies": {
"@bexis2/bexis2-core-ui": "^0.3.8",
"@bexis2/bexis2-core-ui": "^0.3.9",
"@bexis2/bexis2-rpm-ui": "^0.1.0",
"@floating-ui/dom": "^1.4.1",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
Expand Down
22 changes: 1 addition & 21 deletions Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
<Compile Include="Controllers\Legacy\AttachmentsController.cs" />
<Compile Include="Controllers\Hooks\EntityReferenceController.cs" />
<Compile Include="Controllers\FormController.cs" />
<Compile Include="Controllers\Legacy\CreateDatasetController.cs" />
<Compile Include="Controllers\Legacy\HelpController.cs" />
<Compile Include="Controllers\Legacy\ImportMetadataStructureController.cs" />
<Compile Include="Controllers\Legacy\ImportMetadataStructureReadSourceController.cs" />
Expand Down Expand Up @@ -442,7 +443,6 @@
</Content>
<Content Include="Views\Shared\_errorMessages.cshtml" />
<Content Include="Views\Shared\_summaryErrorMessages.cshtml" />
<Content Include="Views\CreateDataset\Index.cshtml" />
<Content Include="Views\Form\MetadataEditor.cshtml" />
<Content Include="Views\Form\_metadataAttributeView.cshtml" />
<Content Include="Views\Form\_metadataCompoundAttributeUsageView.cshtml" />
Expand All @@ -469,35 +469,15 @@
<Content Include="Views\Submit\_taskListView.cshtml" />
<Content Include="Views\Submit\_uploadWizardNav.cshtml" />
<Content Include="Views\Submit\_useTemplateView.cshtml" />
<Content Include="Views\SubmitChooseUpdateMethod\ChooseUpdateMethod.cshtml" />
<Content Include="Views\SubmitGetFileInformation\GetFileInformation.cshtml" />
<Content Include="Views\SubmitGetFileInformation\_txtFormularView.cshtml" />
<Content Include="Views\SubmitGetFileInformation\_xlsFormularView.cshtml" />
<Content Include="Views\SubmitSpecifyDataset\SpecifyDataset.cshtml" />
<Content Include="Views\SubmitSpecifyDataset\_selectADatasetId.cshtml" />
<Content Include="Views\SubmitSummary\Summary.cshtml" />
<Content Include="Views\SubmitUnstructuredData\UnstructuredData.cshtml" />
<Content Include="Views\SubmitValidation\Validation.cshtml" />
<Content Include="Views\Shared\_EntitySelectorInWindowView.cshtml" />
<Content Include="Views\Shared\_EntitySelectorView.cshtml" />
<Content Include="Views\SubmitSelectAFile\SelectAFile.cshtml" />
<Content Include="Views\EasyUploadSelectAFile\SelectAFile.cshtml" />
<Content Include="Views\EasyUploadSheetDataStructure\SheetDataStructure.cshtml" />
<Content Include="Views\EasyUploadSheetSelectMetaData\SheetSelectMetaData.cshtml" />
<Content Include="Views\EasyUploadSummary\EasyUploadSummary.cshtml" />
<Content Include="Views\EasyUploadVerification\Verification.cshtml" />
<Content Include="Views\EasyUpload\UploadWizard.cshtml" />
<Content Include="Views\EasyUpload\_taskListView.cshtml" />
<Content Include="Views\EasyUpload\_uploadWizardNav.cshtml" />
<Content Include="Views\EasyUploadSelectAreas\SelectAreas.cshtml" />
<Content Include="Views\Test\Index.cshtml" />
<Content Include="Views\Form\MetadataEditorOffline.cshtml" />
<Content Include="Views\Form\_metadataCompoundAttributeViewOffline.cshtml" />
<Content Include="Views\Form\_metadataCompoundAttributeUsageViewOffline.cshtml" />
<Content Include="Views\Form\_metadataAttributeViewOffline.cshtml" />
<Content Include="Views\Attachments\Index.cshtml" />
<Content Include="Views\Attachments\_datasetAttachements.cshtml" />
<Content Include="Views\EasyUploadVerification\Row.cshtml" />
<Content Include="Views\EntityReference\Index.cshtml" />
<Content Include="Views\EntityReference\_create.cshtml" />
<Content Include="Views\EntityReference\Show.cshtml" />
Expand Down
4 changes: 1 addition & 3 deletions ...IS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/Legacy/CreateDatasetController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,9 +541,7 @@ public long SubmitDataset(bool valid, string entityname)
{
TaskManager = (CreateTaskmanager)Session["CreateDatasetTaskmanager"];

if (TaskManager.Bus.ContainsKey(CreateTaskmanager.DATASTRUCTURE_ID)
&& TaskManager.Bus.ContainsKey(CreateTaskmanager.RESEARCHPLAN_ID)
&& TaskManager.Bus.ContainsKey(CreateTaskmanager.METADATASTRUCTURE_ID))
if (TaskManager.Bus.ContainsKey(CreateTaskmanager.METADATASTRUCTURE_ID))
{
// for e new dataset
if (!TaskManager.Bus.ContainsKey(CreateTaskmanager.ENTITY_ID))
Expand Down
1 change: 1 addition & 0 deletions Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ public void GenerateSeedData()
entityTemplate.MetadataFields = new List<int>() { 4, 1 };
entityTemplate.HasDatastructure = true;
entityTemplate.DatastructureList = new List<long>();
entityTemplate.AllowedFileTypes = new List<string> { ".csv" };

// set entity
entityTemplate.EntityType = entity;
Expand Down
41 changes: 0 additions & 41 deletions ...IS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/Attachments/_datasetAttachements.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,48 +23,7 @@
}
<table>
<tr>
@if (Model.UploadAccess)
{
<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">
<div id="upload_files">
<h3></h3>
<div class="push_Header stepper">
<h3>Attach files to this dataset</h3>
</div>
<div class="push_Description stepper">
<p>You can select one or multiple files. Please provide a short description for your selected file(s).</p>
<p>
Note: Depending on your network connection the upload may take some time. Please stay patient.
</p>
<p>Maximum file size: @mbMax MB</p>
<p>Maximum file name length: @maxFileNameLength </p>
</div>

@using (Html.BeginForm("ProcessSubmit", "Attachments", new { area = "Dcm", datasetId = datasetId },
FormMethod.Post, new { id = "uploadForm", enctype = "multipart/form-data" }))
{
<div style="display:inline-block;width:50%">
<span style="font-weight:bold">Description:</span><br />
<textarea style="max-width: 100%; min-width: 80%;" name="description" rows="4"></textarea>
</div>
<div style="display:inline-block;width:40%">
<span style="font-weight:bold">Files:</span><br />
@(Html.Telerik().Upload()
.Name("attachments-upload")
.Multiple(true)
.ShowFileList(true)
.ClientEvents(events => events
.OnSelect("Push_OnSelect")
.OnRemove("Push_OnRemove")
))
<br />
<button id="push_submitBt" type="submit" value="Upload" class="bx-button function bx-disabled" disabled="disabled">Upload</button>
</div>
}
</div>

</td>
<td style="width: 20pt; border: none"></td> }
<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;">
<div id="view_files">
<div id="FileList" class="bx-trunc-parent">
Expand Down
Loading

0 comments on commit 5062ae1

Please sign in to comment.