From 1a02b86923b38e2c17cec3b0cdfadb23636f559c Mon Sep 17 00:00:00 2001 From: PC-Axis Date: Wed, 22 Jan 2020 14:24:56 +0000 Subject: [PATCH] ### Enhancements: https://github.com/CSOIreland/PxStat/issues/52 https://github.com/CSOIreland/PxStat/issues/45 https://github.com/CSOIreland/PxStat/issues/40 ### Bugs: https://github.com/CSOIreland/PxStat/issues/56 https://github.com/CSOIreland/PxStat/issues/53 https://github.com/CSOIreland/PxStat/issues/51 https://github.com/CSOIreland/PxStat/issues/50 https://github.com/CSOIreland/PxStat/issues/49 https://github.com/CSOIreland/PxStat/issues/48 https://github.com/CSOIreland/PxStat/issues/46 https://github.com/CSOIreland/PxStat/issues/43 https://github.com/CSOIreland/PxStat/issues/41 https://github.com/CSOIreland/PxStat/issues/37 https://github.com/CSOIreland/PxStat/issues/36 https://github.com/CSOIreland/PxStat/issues/35 https://github.com/CSOIreland/PxStat/issues/34 https://github.com/CSOIreland/PxStat/issues/32 --- client/css/app.library.css | 2 +- .../create/js/create.dimension.library.js | 4 +- .../build/create/js/create.import.library.js | 9 +- .../create/js/create.initiate.library.js | 14 +- client/entity/build/update/js/update.js | 4 +- .../entity/build/update/js/update.library.js | 2 +- .../build/update/js/update.upload.library.js | 24 +- client/entity/build/upload/js/upload.js | 2 +- .../build/upload/js/upload.panel.library.js | 2 +- .../configuration/format/js/format.library.js | 2 +- client/entity/data/index.dataset.html | 68 + client/entity/data/index.html | 2 +- client/entity/data/index.search.html | 32 +- client/entity/data/js/data.dataset.js | 9 + client/entity/data/js/data.dataset.library.js | 42 +- .../entity/data/js/data.dataview.library.js | 20 +- client/entity/data/js/data.js | 21 +- client/entity/data/js/data.library.js | 3 +- .../entity/data/js/data.metadata.library.js | 8 +- client/entity/data/js/data.search.js | 7 +- client/entity/data/js/data.search.library.js | 2 +- .../release/js/keyword.release.library.js | 4 +- client/entity/manage/alert/index.notice.html | 2 +- .../release/js/release.search.library.js | 4 +- client/entity/release/js/release.source.js | 6 - .../release/js/release.source.library.js | 5 +- client/index.html | 16 +- client/internationalisation/label/en.json | 7 +- client/internationalisation/label/pl.json | 9 +- client/js/app.constant.js | 2 +- client/js/app.library.js | 7 +- client/js/app.plugin.js | 19 +- client/template/js/navigation.library.js | 3 +- db/Scripts/1.2.0.sql | 12 + .../matrix/Data_Matrix_DeleteEntities.sql | 13 +- .../Data/matrix/Data_Matrix_ReadCodeList.sql | 33 +- server/PxStat/Entities/Build/BSO/Build_BSO.cs | 25 +- .../Matrix/BSO/Matrix_BSO_ReadCodeList.cs | 2 +- .../PxStat/Entities/Data/Matrix/Matrix_ADO.cs | 7 +- .../PxStat/Entities/Data/Matrix/Matrix_DTO.cs | 15 +- .../PxStat/Entities/Data/Matrix/Matrix_VLD.cs | 2 +- .../Entities/Security/Group/Group_VLD.cs | 4 +- .../Keyword/BSO/Keyword_BSO_ReadSynonym.cs | 36 +- .../BSO/Keyword_BSO_ResourceFactory.cs | 2 +- .../BSO/Email_BSO_GroupMessage_Create.cs | 5 +- .../Email/Email_DTO_GroupMessage.cs | 4 +- .../Settings/Format/BSO/Format_BSO_Read.cs | 7 +- .../WorkflowRequest/WorkflowRequest_VLD.cs | 6 +- server/PxStat/Properties/AssemblyInfo.cs | 4 +- server/PxStat/PxStat.csproj | 9 +- .../keyword/synonym_en.json | 2 +- server/PxStat/Resources/PxParser/PxParser.cs | 49 +- server/PxStat/Resources/PxParser/PxValue.cs | 14 +- server/PxStat/packages.config | 2 +- server/packages/Pidgin.2.1.0/.signature.p7s | Bin 9472 -> 0 bytes .../packages/Pidgin.2.1.0/Pidgin.2.1.0.nupkg | Bin 230871 -> 0 bytes .../Pidgin.2.1.0/lib/net451/Pidgin.dll | Bin 99840 -> 0 bytes .../Pidgin.2.1.0/lib/net451/Pidgin.xml | 2164 ----------------- .../Pidgin.2.1.0/lib/netcoreapp2.0/Pidgin.dll | Bin 99840 -> 0 bytes .../Pidgin.2.1.0/lib/netcoreapp2.0/Pidgin.xml | 2164 ----------------- .../lib/netstandard1.3/Pidgin.dll | Bin 99840 -> 0 bytes .../lib/netstandard1.3/Pidgin.xml | 2164 ----------------- .../lib/netstandard2.0/Pidgin.dll | Bin 99840 -> 0 bytes .../lib/netstandard2.0/Pidgin.xml | 2164 ----------------- 64 files changed, 381 insertions(+), 8891 deletions(-) create mode 100644 db/Scripts/1.2.0.sql delete mode 100644 server/packages/Pidgin.2.1.0/.signature.p7s delete mode 100644 server/packages/Pidgin.2.1.0/Pidgin.2.1.0.nupkg delete mode 100644 server/packages/Pidgin.2.1.0/lib/net451/Pidgin.dll delete mode 100644 server/packages/Pidgin.2.1.0/lib/net451/Pidgin.xml delete mode 100644 server/packages/Pidgin.2.1.0/lib/netcoreapp2.0/Pidgin.dll delete mode 100644 server/packages/Pidgin.2.1.0/lib/netcoreapp2.0/Pidgin.xml delete mode 100644 server/packages/Pidgin.2.1.0/lib/netstandard1.3/Pidgin.dll delete mode 100644 server/packages/Pidgin.2.1.0/lib/netstandard1.3/Pidgin.xml delete mode 100644 server/packages/Pidgin.2.1.0/lib/netstandard2.0/Pidgin.dll delete mode 100644 server/packages/Pidgin.2.1.0/lib/netstandard2.0/Pidgin.xml diff --git a/client/css/app.library.css b/client/css/app.library.css index 5a80b166..2a0e573b 100644 --- a/client/css/app.library.css +++ b/client/css/app.library.css @@ -30,7 +30,7 @@ label.mandatory:before, span.mandatory:before { margin: 0 auto; } -.modal-full .modal-content { +.modal-full>.modal-content { min-height: 100vh; } diff --git a/client/entity/build/create/js/create.dimension.library.js b/client/entity/build/create/js/create.dimension.library.js index c3ac363d..c4d371a1 100644 --- a/client/entity/build/create/js/create.dimension.library.js +++ b/client/entity/build/create/js/create.dimension.library.js @@ -24,7 +24,7 @@ app.build.create.dimension.periodsManualValid = true; */ app.build.create.dimension.ajax.readFormat = function () { api.ajax.jsonrpc.request( - app.config.url.api.private, + app.config.url.api.public, "PxStat.System.Settings.Format_API.Read", { "LngIsoCode": null, @@ -1544,7 +1544,7 @@ app.build.create.dimension.callback.useClassification = function (variables) { app.build.create.dimension.callback.downloadClassification = function (variables) { var fileData = []; $.each(variables, function (i, row) { - fileData.push({ [C_APP_CSV_CODE]: row.VrbCode, C_APP_CSV_VALUE: row.VrbValue }); + fileData.push({ [C_APP_CSV_CODE]: row.VrbCode, [C_APP_CSV_VALUE]: row.VrbValue }); }); var mimeType = "text/plain"; var pom = document.createElement('a'); diff --git a/client/entity/build/create/js/create.import.library.js b/client/entity/build/create/js/create.import.library.js index 21310cef..a5cab33c 100644 --- a/client/entity/build/create/js/create.import.library.js +++ b/client/entity/build/create/js/create.import.library.js @@ -211,14 +211,14 @@ app.build.create.import.callback.read.drawProperties = function () { //get and set the copyright code var cprCode = defaultData.extension.copyright.code; + //make unselected by default + $("#build-create-initiate-setup [name=copyright-code]").val("select"); + //if valid copyright, select this $("#build-create-initiate-setup [name=copyright-code] > option").each(function () { if (this.value == cprCode) { $(this).attr("selected", "selected"); } - else { - $(this).removeAttr("selected"); - } }); //get and set the official flag @@ -242,5 +242,8 @@ app.build.create.import.callback.read.drawProperties = function () { $(this).prop("checked", false); } }); + + //always check default language + $("[name=lng-group][value=" + app.config.language.iso.code + "]").prop("checked", true); } diff --git a/client/entity/build/create/js/create.initiate.library.js b/client/entity/build/create/js/create.initiate.library.js index 58d3625c..658bced9 100644 --- a/client/entity/build/create/js/create.initiate.library.js +++ b/client/entity/build/create/js/create.initiate.library.js @@ -27,9 +27,7 @@ app.build.create.initiate.ajax.matrixLookup = function () { // Change app.config.language.iso.code to the selected one api.ajax.jsonrpc.request(app.config.url.api.private, "PxStat.Data.Matrix_API.ReadCodeList", - { - LngIsoCode: app.label.language.iso.code - }, + null, "app.build.create.initiate.callback.matrixLookup"); }; @@ -70,12 +68,7 @@ app.build.create.initiate.callback.drawMatrix = function (data) { var localOptions = { data: data, columns: [ - { - data: null, - render: function (_data, _type, row) { - return app.library.html.tooltip(row.MtrCode, row.MtrTitle); - } - }, + { data: "MtrCode" } ], drawCallback: function (settings) { app.build.create.initiate.drawCallbackDrawMatrix(); @@ -257,7 +250,8 @@ app.build.create.initiate.callback.readCopyright = function (response) { $("#build-create-initiate-setup").find("[name=copyright-code]").append($("