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($("