Svelte app

- -

Count and check plot IDs -

Enter plot IDs or upload a file. Allowed separators: comma, semicolon, space characters and enter. Also in combination.

Plots:
-
- - - File upload (.csv, .txt) - -

- {#if fileUpload == true} -

- File header exist - -

{/if} - -

- {#if textareaPlots} - - - {:else} - - - {/if} -
-

- - - {#if result} - -

- -

Result

Number of plots

Number of {item.PlotType}: {item.Number}

Joint Experiment 2020

Forest: {#if result.PlotProfiling.JointExperimentForest == true} - yes - {:else} - no - {/if} - -

Grassland: {#if result.PlotProfiling.JointExperimentGrld == true} - yes - {:else} - no - {/if} -

Further details

Number of entered plots: {result.NumberOfAllPlots}

Number of duplicate plots: {result.NumberOfDuplicates}

Non-valid plots: - - {#if result.NotVaildPlotIds.length > 0} - - {#each result.NotVaildPlotIds as item, i} - {item}{#if i < (result.NotVaildPlotIds.length-1)},{/if} - - {/each} - - {:else} - none - - {/if} -

- - {:else} - - {#if run == true} -

- -

- {/if} - - {/if} - - - -

Count and check plot IDs -

Enter plot IDs or upload a file. Allowed separators: comma, semicolon, space characters and enter. Also in combination.

Count and check plot IDs

+ +

Enter plot IDs or upload a file. Allowed separators: comma, semicolon, space characters and enter. Also in combination.

Plots:

@@ -108,31 +108,31 @@ let textareaPlots ="";

{#if fileUpload == true}

- File header exist + File header exists

{/if}

{#if textareaPlots} - - {:else} - - {/if} -
+

@@ -143,22 +143,22 @@ let textareaPlots ="";

Result

Number of plots

Number of {item.plotType}: {item.number}

Number of {item.plotType}: {item.number}

Joint Experiment 2020

Forest: {#if result.plotProfiling.jointExperimentForest == true} +

Joint Experiment 2020

Forest: {#if result.plotProfiling.jointExperimentForest == true} yes {:else} no {/if}

Grassland: {#if result.plotProfiling.jointExperimentGrld == true} +

Grassland: {#if result.plotProfiling.jointExperimentGrld == true} yes {:else} no @@ -167,9 +167,9 @@ let textareaPlots ="";

Further details

Number of entered plots: {result.numberOfAllPlots}

Number of duplicate plots: {result.numberOfDuplicates}

Non-valid plots: +

Number of entered plots: {result.numberOfAllPlots}

Number of duplicate plots: {result.numberOfDuplicates}

Non-valid plots: {#if result.notVaildPlotIds.length > 0} @@ -218,23 +218,7 @@ let textareaPlots =""; } - .container - { - display: flex; - margin-left: 0; - } - - .buttonList - { - padding-left: 20px; - margin-top: 60px; - } - .text - { - padding-left: 20px; - padding-right: 20px; - } .boxLeft{ @@ -267,7 +251,8 @@ let textareaPlots =""; .dtm-para_green { background-color: #bbddd9; - font-size: 14px; + font-size: 16px; + font-weight: bold; padding: 0.5em; margin-block-start: 0; border: 0; From 7087aeae424d2bfdc0b6bb232b53f953f6e6cd31 Mon Sep 17 00:00:00 2001 From: Eleonora Petzold Date: Wed, 4 Dec 2024 14:13:08 +0100 Subject: [PATCH 20/31] update to new core ui --- BExIS.Modules.DPT_BE.UI.Svelte/package-lock.json | 8 ++++---- BExIS.Modules.DPT_BE.UI.Svelte/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BExIS.Modules.DPT_BE.UI.Svelte/package-lock.json b/BExIS.Modules.DPT_BE.UI.Svelte/package-lock.json index 93d24d7..2a363e3 100644 --- a/BExIS.Modules.DPT_BE.UI.Svelte/package-lock.json +++ b/BExIS.Modules.DPT_BE.UI.Svelte/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "ISC", "dependencies": { - "@bexis2/bexis2-core-ui": "0.4.20", + "@bexis2/bexis2-core-ui": "0.4.23", "@bexis2/bexis2-rpm-ui": "^0.1.3", "@floating-ui/dom": "^1.6.3", "@fortawesome/free-solid-svg-icons": "^6.5.2", @@ -77,9 +77,9 @@ } }, "node_modules/@bexis2/bexis2-core-ui": { - "version": "0.4.20", - "resolved": "https://registry.npmjs.org/@bexis2/bexis2-core-ui/-/bexis2-core-ui-0.4.20.tgz", - "integrity": "sha512-uaE27eAEPJurk5GJqq2M4Iej+lKCK3/lZtu6ARNZBLvrJUMIRLmO0Nc9ngtFONJiHw+p31l/dVp1I13EDCE+4Q==", + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/@bexis2/bexis2-core-ui/-/bexis2-core-ui-0.4.23.tgz", + "integrity": "sha512-n91r7F6xriU1+NWGbF27p55LLSOTo1QbJF77N4+qWK9sea/jPNYCl4qsLXfoLwR69LLjayu7sxhde6BlofBcww==", "dependencies": { "@codemirror/lang-html": "^6.4.9", "@codemirror/lang-javascript": "^6.2.2", diff --git a/BExIS.Modules.DPT_BE.UI.Svelte/package.json b/BExIS.Modules.DPT_BE.UI.Svelte/package.json index 50d0b88..a11ead8 100644 --- a/BExIS.Modules.DPT_BE.UI.Svelte/package.json +++ b/BExIS.Modules.DPT_BE.UI.Svelte/package.json @@ -49,7 +49,7 @@ }, "type": "module", "dependencies": { - "@bexis2/bexis2-core-ui": "0.4.20", + "@bexis2/bexis2-core-ui": "0.4.23", "@bexis2/bexis2-rpm-ui": "^0.1.3", "@floating-ui/dom": "^1.6.3", "@fortawesome/free-solid-svg-icons": "^6.5.2", From d5c2779293ce2b20725c6455160b94265ec2d278 Mon Sep 17 00:00:00 2001 From: Eleonora Petzold Date: Wed, 4 Dec 2024 14:14:10 +0100 Subject: [PATCH 21/31] remove js file and update settings --- BExIS.Modules.DPT_BE.UI/DPT_BE.Settings.json | 2 +- BExIS.Modules.DPT_BE.UI/Scripts/dpt_be.js | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 BExIS.Modules.DPT_BE.UI/Scripts/dpt_be.js diff --git a/BExIS.Modules.DPT_BE.UI/DPT_BE.Settings.json b/BExIS.Modules.DPT_BE.UI/DPT_BE.Settings.json index d747fd5..ad30612 100644 --- a/BExIS.Modules.DPT_BE.UI/DPT_BE.Settings.json +++ b/BExIS.Modules.DPT_BE.UI/DPT_BE.Settings.json @@ -46,7 +46,7 @@ { "key": "foxRefDataset", "title": "foxRefDataset", - "value": 31265, + "value": 31040, "description": "", "type": "Int16", "options": [] diff --git a/BExIS.Modules.DPT_BE.UI/Scripts/dpt_be.js b/BExIS.Modules.DPT_BE.UI/Scripts/dpt_be.js deleted file mode 100644 index 546b8e5..0000000 --- a/BExIS.Modules.DPT_BE.UI/Scripts/dpt_be.js +++ /dev/null @@ -1,2 +0,0 @@ -var app=function(){"use strict";function t(){}function e(t,e){for(const n in e)t[n]=e[n];return t}function n(t){return t()}function r(){return Object.create(null)}function o(t){t.forEach(n)}function i(t){return"function"==typeof t}function s(t,e){return t!=t?e==e:t!==e||t&&"object"==typeof t||"function"==typeof t}function c(t,n,r,o){return t[1]&&o?e(r.ctx.slice(),t[1](o(n))):r.ctx}function u(t,e){const n={};e=new Set(e);for(const r in t)e.has(r)||"$"===r[0]||(n[r]=t[r]);return n}function a(t,e){t.appendChild(e)}function l(t,e,n){t.insertBefore(e,n||null)}function f(t){t.parentNode.removeChild(t)}function d(t,e){for(let n=0;nt.removeEventListener(e,n,r)}function b(t,e,n){null==n?t.removeAttribute(e):t.getAttribute(e)!==n&&t.setAttribute(e,n)}function v(t,e){const n=Object.getOwnPropertyDescriptors(t.__proto__);for(const r in e)null==e[r]?t.removeAttribute(r):"style"===r?t.style.cssText=e[r]:"__value"===r?t.value=t[r]=e[r]:n[r]&&n[r].set?t[r]=e[r]:b(t,r,e[r])}function x(t,e){e=""+e,t.wholeText!==e&&(t.data=e)}function w(t,e){t.value=null==e?"":e}function $(t,e,n,r){null===n?t.style.removeProperty(e):t.style.setProperty(e,n,r?"important":"")}let C;function E(t){C=t}function N(t){(function(){if(!C)throw new Error("Function called outside component initialization");return C})().$$.on_mount.push(t)}const P=[],O=[],j=[],A=[],S=Promise.resolve();let R=!1;function k(t){j.push(t)}const L=new Set;let T=0;function _(){const t=C;do{for(;T{U.delete(t),r&&(n&&t.d(1),r())})),t.o(e)}else r&&r()}function z(t,e,r,s){const{fragment:c,on_mount:u,on_destroy:a,after_update:l}=t.$$;c&&c.m(e,r),s||k((()=>{const e=u.map(n).filter(i);a?a.push(...e):o(e),t.$$.on_mount=[]})),l.forEach(k)}function I(t,e){const n=t.$$;null!==n.fragment&&(o(n.on_destroy),n.fragment&&n.fragment.d(e),n.on_destroy=n.fragment=null,n.ctx=[])}function H(t,e){-1===t.$$.dirty[0]&&(P.push(t),R||(R=!0,S.then(_)),t.$$.dirty.fill(0)),t.$$.dirty[e/31|0]|=1<{const o=r.length?r[0]:n;return p.ctx&&c(p.ctx[t],p.ctx[t]=o)&&(!p.skip_bound&&p.bound[t]&&p.bound[t](o),h&&H(e,t)),n})):[],p.update(),h=!0,o(p.before_update),p.fragment=!!s&&s(p.ctx),n.target){if(n.hydrate){const t=function(t){return Array.from(t.childNodes)}(n.target);p.fragment&&p.fragment.l(t),t.forEach(f)}else p.fragment&&p.fragment.c();n.intro&&q(e.$$.fragment),z(e,n.target,n.anchor,n.customElement),_()}E(d)}class V{$destroy(){I(this,1),this.$destroy=t}$on(t,e){const n=this.$$.callbacks[t]||(this.$$.callbacks[t]=[]);return n.push(e),()=>{const t=n.indexOf(e);-1!==t&&n.splice(t,1)}}$set(t){var e;this.$$set&&(e=t,0!==Object.keys(e).length)&&(this.$$.skip_bound=!0,this.$$set(t),this.$$.skip_bound=!1)}}const J=[];function X(e,n=t){let r;const o=new Set;function i(t){if(s(e,t)&&(e=t,r)){const t=!J.length;for(const t of o)t[1](),J.push(t,e);if(t){for(let t=0;t{o.delete(u),0===o.size&&(r(),r=null)}}}}var G=function(t,e){return function(){for(var n=new Array(arguments.length),r=0;r=0)return;u[o]="set-cookie"===o?(u[o]?u[o]:[]).concat([s]):u[o]?u[o]+", "+s:s}})),u):u):null,l={data:t.responseType&&"text"!==t.responseType?i.response:i.responseText,status:i.status,statusText:i.statusText,headers:a,config:t,request:i};!function(t,e,n){var r=n.config.validateStatus;n.status&&r&&!r(n.status)?e(lt("Request failed with status code "+n.status,n.config,null,n.request,n)):t(n)}(e,n,l),i=null}},i.onabort=function(){i&&(n(lt("Request aborted",t,"ECONNABORTED",i)),i=null)},i.onerror=function(){n(lt("Network Error",t,null,i)),i=null},i.ontimeout=function(){var e="timeout of "+t.timeout+"ms exceeded";t.timeoutErrorMessage&&(e=t.timeoutErrorMessage),n(lt(e,t,"ECONNABORTED",i)),i=null},nt.isStandardBrowserEnv()){var f=(t.withCredentials||pt(l))&&t.xsrfCookieName?ft.read(t.xsrfCookieName):void 0;f&&(o[t.xsrfHeaderName]=f)}if("setRequestHeader"in i&&nt.forEach(o,(function(t,e){void 0===r&&"content-type"===e.toLowerCase()?delete o[e]:i.setRequestHeader(e,t)})),nt.isUndefined(t.withCredentials)||(i.withCredentials=!!t.withCredentials),t.responseType)try{i.responseType=t.responseType}catch(e){if("json"!==t.responseType)throw e}"function"==typeof t.onDownloadProgress&&i.addEventListener("progress",t.onDownloadProgress),"function"==typeof t.onUploadProgress&&i.upload&&i.upload.addEventListener("progress",t.onUploadProgress),t.cancelToken&&t.cancelToken.promise.then((function(t){i&&(i.abort(),n(t),i=null)})),r||(r=null),i.send(r)}))},mt={"Content-Type":"application/x-www-form-urlencoded"};function gt(t,e){!nt.isUndefined(t)&&nt.isUndefined(t["Content-Type"])&&(t["Content-Type"]=e)}var yt,bt={adapter:(("undefined"!=typeof XMLHttpRequest||"undefined"!=typeof process&&"[object process]"===Object.prototype.toString.call(process))&&(yt=ht),yt),transformRequest:[function(t,e){return at(e,"Accept"),at(e,"Content-Type"),nt.isFormData(t)||nt.isArrayBuffer(t)||nt.isBuffer(t)||nt.isStream(t)||nt.isFile(t)||nt.isBlob(t)?t:nt.isArrayBufferView(t)?t.buffer:nt.isURLSearchParams(t)?(gt(e,"application/x-www-form-urlencoded;charset=utf-8"),t.toString()):nt.isObject(t)?(gt(e,"application/json;charset=utf-8"),JSON.stringify(t)):t}],transformResponse:[function(t){if("string"==typeof t)try{t=JSON.parse(t)}catch(t){}return t}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,maxBodyLength:-1,validateStatus:function(t){return t>=200&&t<300}};bt.headers={common:{Accept:"application/json, text/plain, */*"}},nt.forEach(["delete","get","head"],(function(t){bt.headers[t]={}})),nt.forEach(["post","put","patch"],(function(t){bt.headers[t]=nt.merge(mt)}));var vt=bt;function xt(t){t.cancelToken&&t.cancelToken.throwIfRequested()}var wt=function(t){return xt(t),t.headers=t.headers||{},t.data=ct(t.data,t.headers,t.transformRequest),t.headers=nt.merge(t.headers.common||{},t.headers[t.method]||{},t.headers),nt.forEach(["delete","get","head","post","put","patch","common"],(function(e){delete t.headers[e]})),(t.adapter||vt.adapter)(t).then((function(e){return xt(t),e.data=ct(e.data,e.headers,t.transformResponse),e}),(function(e){return ut(e)||(xt(t),e&&e.response&&(e.response.data=ct(e.response.data,e.response.headers,t.transformResponse))),Promise.reject(e)}))},$t=function(t,e){e=e||{};var n={},r=["url","method","data"],o=["headers","auth","proxy","params"],i=["baseURL","transformRequest","transformResponse","paramsSerializer","timeout","timeoutMessage","withCredentials","adapter","responseType","xsrfCookieName","xsrfHeaderName","onUploadProgress","onDownloadProgress","decompress","maxContentLength","maxBodyLength","maxRedirects","transport","httpAgent","httpsAgent","cancelToken","socketPath","responseEncoding"],s=["validateStatus"];function c(t,e){return nt.isPlainObject(t)&&nt.isPlainObject(e)?nt.merge(t,e):nt.isPlainObject(e)?nt.merge({},e):nt.isArray(e)?e.slice():e}function u(r){nt.isUndefined(e[r])?nt.isUndefined(t[r])||(n[r]=c(void 0,t[r])):n[r]=c(t[r],e[r])}nt.forEach(r,(function(t){nt.isUndefined(e[t])||(n[t]=c(void 0,e[t]))})),nt.forEach(o,u),nt.forEach(i,(function(r){nt.isUndefined(e[r])?nt.isUndefined(t[r])||(n[r]=c(void 0,t[r])):n[r]=c(void 0,e[r])})),nt.forEach(s,(function(r){r in e?n[r]=c(t[r],e[r]):r in t&&(n[r]=c(void 0,t[r]))}));var a=r.concat(o).concat(i).concat(s),l=Object.keys(t).concat(Object.keys(e)).filter((function(t){return-1===a.indexOf(t)}));return nt.forEach(l,u),n};function Ct(t){this.defaults=t,this.interceptors={request:new st,response:new st}}Ct.prototype.request=function(t){"string"==typeof t?(t=arguments[1]||{}).url=arguments[0]:t=t||{},(t=$t(this.defaults,t)).method?t.method=t.method.toLowerCase():this.defaults.method?t.method=this.defaults.method.toLowerCase():t.method="get";var e=[wt,void 0],n=Promise.resolve(t);for(this.interceptors.request.forEach((function(t){e.unshift(t.fulfilled,t.rejected)})),this.interceptors.response.forEach((function(t){e.push(t.fulfilled,t.rejected)}));e.length;)n=n.then(e.shift(),e.shift());return n},Ct.prototype.getUri=function(t){return t=$t(this.defaults,t),ot(t.url,t.params,t.paramsSerializer).replace(/^\?/,"")},nt.forEach(["delete","get","head","options"],(function(t){Ct.prototype[t]=function(e,n){return this.request($t(n||{},{method:t,url:e,data:(n||{}).data}))}})),nt.forEach(["post","put","patch"],(function(t){Ct.prototype[t]=function(e,n,r){return this.request($t(r||{},{method:t,url:e,data:n}))}}));var Et=Ct;function Nt(t){this.message=t}Nt.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},Nt.prototype.__CANCEL__=!0;var Pt=Nt;function Ot(t){if("function"!=typeof t)throw new TypeError("executor must be a function.");var e;this.promise=new Promise((function(t){e=t}));var n=this;t((function(t){n.reason||(n.reason=new Pt(t),e(n.reason))}))}Ot.prototype.throwIfRequested=function(){if(this.reason)throw this.reason},Ot.source=function(){var t;return{token:new Ot((function(e){t=e})),cancel:t}};var jt=Ot;function At(t){var e=new Et(t),n=G(Et.prototype.request,e);return nt.extend(n,Et.prototype,e),nt.extend(n,e),n}var St=At(vt);St.Axios=Et,St.create=function(t){return At($t(St.defaults,t))},St.Cancel=Pt,St.CancelToken=jt,St.isCancel=ut,St.all=function(t){return Promise.all(t)},St.spread=function(t){return function(e){return t.apply(null,e)}},St.isAxiosError=function(t){return"object"==typeof t&&!0===t.isAxiosError};var Rt=St;St.default=Rt;const kt=X(window.location.origin),Lt=X("");function Tt(t){let e="";if("string"==typeof t||"number"==typeof t)e+=t;else if("object"==typeof t)if(Array.isArray(t))e=t.map(Tt).filter(Boolean).join(" ");else for(let n in t)t[n]&&(e&&(e+=" "),e+=n);return e}function _t(t){let n,r,o;const i=t[7].default,s=function(t,e,n,r){if(t){const o=c(t,e,n,r);return t[0](o)}}(i,t,t[6],null),u=s||function(t){let e;return{c(){e=h("Loading...")},m(t,n){l(t,e,n)},d(t){t&&f(e)}}}();let d=[t[1],{role:"status"},{class:t[0]}],m={};for(let t=0;t32){const e=[],n=t.ctx.length/32;for(let t=0;t{n=e(e({},n),function(t){const e={};for(const n in t)"$"!==n[0]&&(e[n]=t[n]);return e}(t)),r(1,s=u(n,i)),"class"in t&&r(2,l=t.class),"type"in t&&r(3,f=t.type),"size"in t&&r(4,d=t.size),"color"in t&&r(5,p=t.color),"$$scope"in t&&r(6,a=t.$$scope)},t.$$.update=()=>{60&t.$$.dirty&&r(0,o=function(...t){return t.map(Tt).filter(Boolean).join(" ")}(l,!!d&&`spinner-${f}-${d}`,`spinner-${f}`,!!p&&`text-${p}`))},[o,s,l,f,d,p,a,c]}kt.subscribe((t=>{})),Lt.subscribe((t=>{})),Lt.subscribe((t=>{})),console.log("setup axios");class Ut extends V{constructor(t){super(),M(this,t,Bt,_t,s,{class:2,type:3,size:4,color:5})}}function Dt(t,e,n){const r=t.slice();return r[17]=e[n],r[19]=n,r}function qt(t,e,n){const r=t.slice();return r[17]=e[n],r[19]=n,r}function Ft(t){let e,n,r,i,s,c,u,d,g,v,w,C,E;return{c(){e=p("div"),n=p("input"),r=h(" File header exist\r\n\t\t"),i=p("form"),s=p("input"),c=p("br"),u=m(),d=p("input"),g=m(),v=p("p"),w=h(t[5]),b(n,"type","checkbox"),b(s,"type","file"),b(d,"type","submit"),d.value="Submit",b(d,"class","bx-button small function"),$(v,"color","red"),$(v,"width","400px"),b(e,"class","boxLeft svelte-1f7li9m")},m(o,f){var p;l(o,e,f),a(e,n),n.checked=t[3],a(e,r),a(e,i),a(i,s),a(i,c),a(i,u),a(i,d),a(i,g),a(i,v),a(v,w),C||(E=[y(n,"change",t[13]),y(s,"change",t[14]),y(i,"submit",(p=t[7],function(t){return t.preventDefault(),p.call(this,t)}))],C=!0)},p(t,e){8&e&&(n.checked=t[3]),32&e&&x(w,t[5])},d(t){t&&f(e),C=!1,o(E)}}}function zt(e){let n,r,i,s,c;return{c(){n=p("button"),n.textContent="Run",r=m(),i=p("button"),i.textContent="Clear",b(n,"class","bx-button small function bx-disabled"),b(i,"class","bx-button small function bx-disabled")},m(t,o){l(t,n,o),l(t,r,o),l(t,i,o),s||(c=[y(n,"click",e[8]),y(i,"click",e[9])],s=!0)},p:t,d(t){t&&f(n),t&&f(r),t&&f(i),s=!1,o(c)}}}function It(e){let n,r,i,s,c;return{c(){n=p("button"),n.textContent="Run",r=m(),i=p("button"),i.textContent="Clear",b(n,"class","bx-button small function"),b(i,"class","bx-button small function")},m(t,o){l(t,n,o),l(t,r,o),l(t,i,o),s||(c=[y(n,"click",e[8]),y(i,"click",e[9])],s=!0)},p:t,d(t){t&&f(n),t&&f(r),t&&f(i),s=!1,o(c)}}}function Ht(e){let n,r,o;return r=new Ut({props:{color:"primary",size:"sm"}}),{c(){var t;n=p("div"),(t=r.$$.fragment)&&t.c(),b(n,"class","spinnerBox svelte-1f7li9m")},m(t,e){l(t,n,e),z(r,n,null),o=!0},p:t,i(t){o||(q(r.$$.fragment,t),o=!0)},o(t){F(r.$$.fragment,t),o=!1},d(t){t&&f(n),I(r)}}}function Mt(e){let n,r,o,i,s,c,u,g,y,v,w,$,C,E,N,P,O,j,A,S,R,k,L,T,_,B,U,D,q,F,z,I,H=e[1].NumberOfAllPlots+"",M=e[1].NumberOfDuplicates+"",V=e[1].PlotProfiling.PlotTypeCounters,J=[];for(let t=0;t0?Wt:Qt}let tt=Z(e),et=tt(e);return{c(){n=p("div"),r=p("p"),r.textContent="Result",o=m(),i=p("ul"),s=p("li"),s.innerHTML="Number of plots",c=m();for(let t=0;tJoint Experiment 2020",y=m(),v=p("p"),w=p("b"),w.textContent="Forest:",$=m(),K.c(),C=m(),E=p("p"),N=p("b"),N.textContent="Grassland:",P=m(),Y.c(),O=m(),j=p("li"),j.innerHTML="Further details",A=m(),S=p("p"),R=p("b"),R.textContent="Number of entered plots:",k=m(),L=h(H),T=m(),_=p("p"),B=p("b"),B.textContent="Number of duplicate plots:",U=m(),D=h(M),q=m(),F=p("p"),z=p("b"),z.textContent="Non-valid plots:",I=m(),et.c(),b(r,"class","dtm-para_green svelte-1f7li9m"),b(v,"class","resultList svelte-1f7li9m"),b(E,"class","resultList svelte-1f7li9m"),b(S,"class","resultList svelte-1f7li9m"),b(_,"class","resultList svelte-1f7li9m"),b(F,"class","resultList-overflow svelte-1f7li9m"),b(n,"class","boxOuter svelte-1f7li9m"),b(n,"id","results")},m(t,e){l(t,n,e),a(n,r),a(n,o),a(n,i),a(i,s),a(i,c);for(let t=0;t{Q[i]=null})),D.r||o(D.c),D=D.p),~U?(z=Q[U],z?z.p(t,e):(z=Q[U]=K[U](t),z.c()),q(z,1),z.m(n,null)):z=null)},i(t){I||(q(z),I=!0)},o(t){F(z),I=!1},d(t){t&&f(e),V&&V.d(),G.d(),~U&&Q[U].d(),H=!1,o(M)}}}function ee(t,e,n){let r,o,i=[],s=!1,c=!1,u=!1,a="";const l="/api/DPT_BE/CountPlots";N((async()=>{}));let f="";return[r,o,s,c,u,a,f,()=>{!function(t){if("text/plain"==t.type||"text/csv"==t.type){n(5,a="");const e=new FileReader,r=t;e.readAsText(r),e.onload=function(t){const e=t.target.result;console.log("text",e),n(6,f=e)}}else n(5,a="File format is not supported. Please use .txt or .csv.")}(r[0])},async function(){if(n(4,u=!0),n(1,o=""),c){var t=f.split("\n");t.filter((t=>""!==t.trim())),t.splice(0,1);let e=t.join("\n");i=e.split(/[\r\n,\t\s;]+/)}else i=f.split(/[\r\n,\t\s;]+/).filter((t=>""!==t.trim()));const e=await async function(t,e){let n={plots:e};console.log(n);const r=await fetch(t,{method:"POST",headers:{"content-type":"application/json"},body:JSON.stringify(n)});return await r.json()}(l,i);console.log(e),n(1,o=e)},function(){n(6,f=""),n(1,o=""),n(4,u=!1)},l,function(){f=this.value,n(6,f)},function(){s=this.checked,n(2,s)},function(){c=this.checked,n(3,c)},function(){r=this.files,n(0,r)}]}return new class extends V{constructor(t){super(),M(this,t,ee,te,s,{HostURL:10})}get HostURL(){return this.$$.ctx[10]}}({target:document.getElementById("plotProfiling")})}(); -//# sourceMappingURL=dpt_be.js.map From 25b431f4faceb8ff3c47f1570886d3219b8ec3b7 Mon Sep 17 00:00:00 2001 From: Eleonora Petzold Date: Thu, 5 Dec 2024 13:36:11 +0100 Subject: [PATCH 22/31] remove js file ref --- BExIS.Modules.DPT_BE.UI/BExIS.Modules.DPT_BE.UI.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/BExIS.Modules.DPT_BE.UI/BExIS.Modules.DPT_BE.UI.csproj b/BExIS.Modules.DPT_BE.UI/BExIS.Modules.DPT_BE.UI.csproj index 4618b30..421539a 100644 --- a/BExIS.Modules.DPT_BE.UI/BExIS.Modules.DPT_BE.UI.csproj +++ b/BExIS.Modules.DPT_BE.UI/BExIS.Modules.DPT_BE.UI.csproj @@ -401,7 +401,6 @@ - From f6788f85d6420fe5b747f80774423da1c8507396 Mon Sep 17 00:00:00 2001 From: Eleonora Petzold Date: Wed, 16 Apr 2025 13:47:57 +0200 Subject: [PATCH 23/31] fix API after update to bexis core 4.0.0 --- .../BExIS.Modules.DPT_BE.UI.csproj | 4 + .../API/PlotProfilingOutController.cs | 8 +- BExIS.Modules.DPT_BE.UI/Helper/DataAccess.cs | 6 +- BExIS.Modules.DPT_BE.UI/Model/ApiModels.cs | 99 ++++++++++++------- 4 files changed, 73 insertions(+), 44 deletions(-) diff --git a/BExIS.Modules.DPT_BE.UI/BExIS.Modules.DPT_BE.UI.csproj b/BExIS.Modules.DPT_BE.UI/BExIS.Modules.DPT_BE.UI.csproj index 421539a..e96b273 100644 --- a/BExIS.Modules.DPT_BE.UI/BExIS.Modules.DPT_BE.UI.csproj +++ b/BExIS.Modules.DPT_BE.UI/BExIS.Modules.DPT_BE.UI.csproj @@ -476,6 +476,10 @@ {c4ca0a99-0af3-4372-a9b7-b9073599bd8b} BExIS.Dlm.Services + + {455EC826-9A92-40FF-BD3B-388C288955CE} + BExIS.IO.Transform.Output + {c8a05313-b960-406e-92ec-c1e5b3f47fcd} BExIS.IO.Transform.Validation diff --git a/BExIS.Modules.DPT_BE.UI/Controllers/API/PlotProfilingOutController.cs b/BExIS.Modules.DPT_BE.UI/Controllers/API/PlotProfilingOutController.cs index 6c6c65e..dc2c498 100644 --- a/BExIS.Modules.DPT_BE.UI/Controllers/API/PlotProfilingOutController.cs +++ b/BExIS.Modules.DPT_BE.UI/Controllers/API/PlotProfilingOutController.cs @@ -47,21 +47,21 @@ public HttpResponseMessage Post([FromBody]PostApiPlotCount data) //get gp ref dataset string gpRefDatasetId = settings.GetValueByKey("gpRefDataset").ToString(); var datasetObjectGp = DataAccess.GetDatasetInfo(gpRefDatasetId, GetServerInformation()); - DataTable gpPlotRefTable = DataAccess.GetData(gpRefDatasetId, long.Parse(datasetObjectGp.DataStructureId), GetServerInformation()); + DataTable gpPlotRefTable = DataAccess.GetData(gpRefDatasetId, datasetObjectGp.DataStructureId, GetServerInformation()); //get ep ref data set to find mips and vips string epRefDatasetId = settings.GetValueByKey("epRefDataset").ToString(); var datasetObject = DataAccess.GetDatasetInfo(epRefDatasetId, GetServerInformation()); - DataTable epPlotRefTable = DataAccess.GetData(epRefDatasetId, long.Parse(datasetObject.DataStructureId), GetServerInformation()); + DataTable epPlotRefTable = DataAccess.GetData(epRefDatasetId, datasetObject.DataStructureId, GetServerInformation()); //get new experiment plots datasets string foxRefDatasetId = settings.GetValueByKey("foxRefDataset").ToString(); var datasetObjectFox = DataAccess.GetDatasetInfo(foxRefDatasetId, GetServerInformation()); - DataTable foxPlotRefTable = DataAccess.GetData(foxRefDatasetId, long.Parse(datasetObjectFox.DataStructureId), GetServerInformation()); + DataTable foxPlotRefTable = DataAccess.GetData(foxRefDatasetId, datasetObjectFox.DataStructureId, GetServerInformation()); string gNewExpRefDatasetId = settings.GetValueByKey("gNewExpDataset").ToString(); var datasetObjectgNewExp = DataAccess.GetDatasetInfo(gNewExpRefDatasetId, GetServerInformation()); - DataTable gNewExpPlotRefTable = DataAccess.GetData(gNewExpRefDatasetId, long.Parse(datasetObjectgNewExp.DataStructureId), GetServerInformation()); + DataTable gNewExpPlotRefTable = DataAccess.GetData(gNewExpRefDatasetId, datasetObjectgNewExp.DataStructureId, GetServerInformation()); // diff --git a/BExIS.Modules.DPT_BE.UI/Helper/DataAccess.cs b/BExIS.Modules.DPT_BE.UI/Helper/DataAccess.cs index c2add94..897e257 100644 --- a/BExIS.Modules.DPT_BE.UI/Helper/DataAccess.cs +++ b/BExIS.Modules.DPT_BE.UI/Helper/DataAccess.cs @@ -32,10 +32,10 @@ public static DataTable GetData(string datasetId, long structureId, ServerInform DataStructureObject dataStructureObject = GetDataStructure(structureId, serverInformation); DataTable data = new DataTable(); - foreach (var variable in dataStructureObject.Variables) + foreach (var variable in dataStructureObject.variables) { - DataColumn col = new DataColumn(variable.Label); - col.DataType = System.Type.GetType("System." + variable.SystemType); + DataColumn col = new DataColumn(variable.label); + col.DataType = System.Type.GetType("System." + variable.systemType); col.AllowDBNull = true; data.Columns.Add(col); } diff --git a/BExIS.Modules.DPT_BE.UI/Model/ApiModels.cs b/BExIS.Modules.DPT_BE.UI/Model/ApiModels.cs index 4edb058..3219cf7 100644 --- a/BExIS.Modules.DPT_BE.UI/Model/ApiModels.cs +++ b/BExIS.Modules.DPT_BE.UI/Model/ApiModels.cs @@ -1,4 +1,5 @@ -using System; +using BExIS.IO.Transform.Output; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -24,59 +25,83 @@ public class ServerInformation /// public class DataStructureObject { - public string Id { get; set; } - public string Title { get; set; } - public string Description { get; set; } - public string inUse { get; set; } - public string Structured { get; set; } - public List Variables { get; set; } + public int id { get; set; } + public string title { get; set; } + public string desciption { get; set; } + public bool inUse { get; set; } + public List variables { get; set; } } - public class Variables + public class Constraint { - public string Id { get; set; } - public string Label { get; set; } - public string Description { get; set; } - public string isOptional { get; set; } - public string Unit { get; set; } - public string DataType { get; set; } - public string SystemType { get; set; } - public string AttributeName { get; set; } - public string AttributeDescription { get; set; } + public int id { get; set; } + public string name { get; set; } + public string type { get; set; } + public string description { get; set; } } - ///

- /// Class to store dataset information receive via api - /// - ///