Skip to content

Commit

Permalink
feat: remove json parse from all components
Browse files Browse the repository at this point in the history
  • Loading branch information
@ivanzavisic
ivanzavisic committed Oct 30, 2023
1 parent 09a19f3 commit 187a955
Show file tree
Hide file tree
Showing 12 changed files with 532 additions and 244 deletions.
30 changes: 30 additions & 0 deletions packages/demo/src/mock-service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,36 @@ export class MockService implements Service {
G2xaverage: "0.150",
G2yourscore: "0.175",
G2percentile: "99",
Bxmin: "0.111",
Bxmax: "0.175",
Bxaverage: "0.150",
Byourscore: "0.175",
Bpercentile: "99",
Sxmin: "0.111",
Sxmax: "0.175",
Sxaverage: "0.150",
Syourscore: "0.175",
Spercentile: "99",
P18xmin: "0.111",
P18xmax: "0.175",
P18xaverage: "0.150",
P18yourscore: "0.175",
P18percentile: "99",
P22xmin: "0.111",
P22xmax: "0.175",
P22xaverage: "0.150",
P22yourscore: "0.175",
P22percentile: "99",
P23xmin: "0.111",
P23xmax: "0.175",
P23xaverage: "0.150",
P23yourscore: "0.175",
P23percentile: "99",
P26xmin: "0.111",
P26xmax: "0.175",
P26xaverage: "0.150",
P26yourscore: "0.175",
P26percentile: "99",
});

}
Expand Down
1 change: 0 additions & 1 deletion packages/lib/src/arthritis/arthritis.wc.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
mid2 = reportData.G1xaverage;
res2 = reportData.G1yourscore;
perc2 = reportData.G1percentile;
min3 = reportData.G2xmin;
max3 = reportData.G2xmax;
mid3 = reportData.G2xaverage;
Expand Down
73 changes: 49 additions & 24 deletions packages/lib/src/colitis/colitis.wc.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,39 @@
import type {Language} from '../shared/interfaces/language.interface';
import {onMount} from 'svelte';
import {getPadding, getMargin, getBorderRadius, moveDiv, suffix} from '../shared/functions/helpers';
import {Service} from '../shared/utils/service';
// Language of the rendered list
export let language: Language;
// ID of the report
export let report: string;
export let type: string;
let min1 = 0.081; // G0xmin
let max1 = 0.185; // G0xmax
let mid1 = 0.133; // G0xaverage
let res1 = 0.134; // G0yourscore
let perc1 = 52; // G0percentile
let min2 = 0.091; // G1xmin
let max2 = 0.216; // G1xmax
let mid2 = 0.199; // G1xaverage
let res2 = 0.205; // G1yourscore
let perc2 = 55; // G1percentile
let min3 = 0.109; // G2xmin
let max3 = 0.175; // G2xmax
let mid3 = 0.140; //G2xaverage
let res3 = 0.133; // G2yourscore
let perc3 = 33; // G2percentile
let min4 = 0.109; // Bxmin
let max4 = 0.175; // Bxmax
let mid4 = 0.140; //Bxaverage
let res4 = 0.110; // Byourscore
let perc4 = 20; // Bpercentile
export let service: Service = window.GaReportService;
let reportData: any;
let min1 = 0; // G0xmin
let max1 = 0; // G0xmax
let mid1 = 0; // G0xaverage
let res1 = 0; // G0yourscore
let perc1 = 0; // G0percentile
let min2 = 0; // G1xmin
let max2 = 0; // G1xmax
let mid2 = 0; // G1xaverage
let res2 = 0; // G1yourscore
let perc2 = 0; // G1percentile
let min3 = 0; // G2xmin
let max3 = 0; // G2xmax
let mid3 = 0; //G2xaverage
let res3 = 0; // G2yourscore
let perc3 = 0; // G2percentile
let min4 = 0; // Bxmin
let max4 = 0; // Bxmax
let mid4 = 0; //Bxaverage
let res4 = 0; // Byourscore
let perc4 = 0; // Bpercentile
let overlap = false;
Expand Down Expand Up @@ -101,6 +104,28 @@
}
onMount(() => {
reportData = service.getReport(undefined);
min1 = reportData.G0xmin;
max1 = reportData.G0xmax;
mid1 = reportData.G0xaverage;
res1 = reportData.G0yourscore;
perc1 = reportData.G0percentile;
min2 = reportData.G1xmin;
max2 = reportData.G1xmax;
mid2 = reportData.G1xaverage;
res2 = reportData.G1yourscore;
perc2 = reportData.G1percentile;
min3 = reportData.G2xmin;
max3 = reportData.G2xmax;
mid3 = reportData.G2xaverage;
res3 = reportData.G2yourscore;
perc3 = reportData.G2percentile;
min4 = reportData.Bxmin;
max4 = reportData.Bxmax;
mid4 = reportData.Bxaverage;
res4 = reportData.Byourscore;
perc4 = reportData.Bpercentile;
if (res1 > mid1 && res2 < mid2 && res3 < mid3 && res4 < mid4) {
overlap = true;
return;
Expand Down
90 changes: 60 additions & 30 deletions packages/lib/src/colorectal/colorectal.wc.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,45 @@
import type {Language} from '../shared/interfaces/language.interface';
import {onMount} from 'svelte';
import {getPadding, getMargin, getBorderRadius, moveDiv, suffix} from '../shared/functions/helpers';
import {Service} from '../shared/utils/service';
// Language of the rendered list
export let language: Language;
// ID of the report
export let report: string;
export let type: string;
let min1 = 0.081; // G0xmin
let max1 = 0.185; // G0xmax
let mid1 = 0.133; // G0xaverage
let res1 = 0.100; // G0yourscore
let perc1 = 20; // G0percentile
let min2 = 0.091; // G1xmin
let max2 = 0.216; // G1xmax
let mid2 = 0.199; // G1xaverage
let res2 = 0.201; // G1yourscore
let perc2 = 59; // G1percentile
let min3 = 0.109; // G2xmin
let max3 = 0.175; // G2xmax
let mid3 = 0.140; //G2xaverage
let res3 = 0.188; // G2yourscore
let perc3 = 55; // G2percentile
let min4 = 0.109; // Sxmin
let max4 = 0.175; // Sxmax
let mid4 = 0.140; //Sxaverage
let res4 = 0.188; // Syourscore
let perc4 = 51; // Spercentile
let min5 = 0.109; // Bxmin
let max5 = 0.175; // Bxmax
let mid5 = 0.140; //Bxaverage
let res5 = 0.133; // Byourscore
let perc5 = 44; // Bpercentile
export let service: Service = window.GaReportService;
let reportData: any;
let min1 = 0; // G0xmin
let max1 = 0; // G0xmax
let mid1 = 0; // G0xaverage
let res1 = 0; // G0yourscore
let perc1 = 0; // G0percentile
let min2 = 0; // G1xmin
let max2 = 0; // G1xmax
let mid2 = 0; // G1xaverage
let res2 = 0; // G1yourscore
let perc2 = 0; // G1percentile
let min3 = 0; // G2xmin
let max3 = 0; // G2xmax
let mid3 = 0; //G2xaverage
let res3 = 0; // G2yourscore
let perc3 = 0; // G2percentile
let min4 = 0; // Sxmin
let max4 = 0; // Sxmax
let mid4 = 0; //Sxaverage
let res4 = 0; // Syourscore
let perc4 = 0; // Spercentile
let min5 = 0; // Bxmin
let max5 = 0; // Bxmax
let mid5 = 0; //Bxaverage
let res5 = 0; // Byourscore
let perc5 = 0; // Bpercentile
let overlap = false;
let someOverlap = false;
Expand Down Expand Up @@ -106,6 +109,33 @@
}
onMount(() => {
reportData = service.getReport(undefined);
min1 = reportData.G0xmin;
max1 = reportData.G0xmax;
mid1 = reportData.G0xaverage;
res1 = reportData.G0yourscore;
perc1 = reportData.G0percentile;
min2 = reportData.G1xmin;
max2 = reportData.G1xmax;
mid2 = reportData.G1xaverage;
res2 = reportData.G1yourscore;
perc2 = reportData.G1percentile;
min3 = reportData.G2xmin;
max3 = reportData.G2xmax;
mid3 = reportData.G2xaverage;
res3 = reportData.G2yourscore;
perc3 = reportData.G2percentile;
min4 = reportData.Sxmin;
max4 = reportData.Sxmax;
mid4 = reportData.Sxaverage;
res4 = reportData.Syourscore;
perc4 = reportData.Spercentile;
min5 = reportData.Bxmin;
max5 = reportData.Bxmax;
mid5 = reportData.Bxaverage;
res5 = reportData.Byourscore;
perc5 = reportData.Bpercentile;
if (res1 > mid1 && res2 < mid2 && res3 < mid3 && res4 < mid4 && res5 > mid5) {
overlap = true;
return;
Expand Down
89 changes: 59 additions & 30 deletions packages/lib/src/crohn/crohn.wc.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,45 @@
import type {Language} from '../shared/interfaces/language.interface';
import {onMount} from 'svelte';
import {getPadding, getMargin, getBorderRadius, moveDiv, suffix} from '../shared/functions/helpers';
import {Service} from '../shared/utils/service';
// Language of the rendered list
export let language: Language;
// ID of the report
export let report: string;
export let type: string;
let min1 = 0.081; // G0xmin
let max1 = 0.185; // G0xmax
let mid1 = 0.133; // G0xaverage
let res1 = 0.155; // G0yourscore
let perc1 = 55; // G0percentile
let min2 = 0.091; // G1xmin
let max2 = 0.216; // G1xmax
let mid2 = 0.199; // G1xaverage
let res2 = 0.133; // G1yourscore
let perc2 = 33; // G1percentile
let min3 = 0.109; // G2xmin
let max3 = 0.175; // G2xmax
let mid3 = 0.140; //G2xaverage
let res3 = 0.133; // G2yourscore
let perc3 = 33; // G2percentile
let min4 = 0.109; // Sxmin
let max4 = 0.175; // Sxmax
let mid4 = 0.140; //Sxaverage
let res4 = 0.133; // Syourscore
let perc4 = 33; // Spercentile
let min5 = 0.109; // Bxmin
let max5 = 0.175; // Bxmax
let mid5 = 0.140; //Bxaverage
let res5 = 0.155; // Byourscore
let perc5 = 55; // Bpercentile
export let service: Service = window.GaReportService;
let reportData: any;
let min1 = 0; // G0xmin
let max1 = 0; // G0xmax
let mid1 = 0; // G0xaverage
let res1 = 0; // G0yourscore
let perc1 = 0; // G0percentile
let min2 = 0; // G1xmin
let max2 = 0; // G1xmax
let mid2 = 0; // G1xaverage
let res2 = 0; // G1yourscore
let perc2 = 0; // G1percentile
let min3 = 0; // G2xmin
let max3 = 0; // G2xmax
let mid3 = 0; //G2xaverage
let res3 = 0; // G2yourscore
let perc3 = 0; // G2percentile
let min4 = 0; // Sxmin
let max4 = 0; // Sxmax
let mid4 = 0; //Sxaverage
let res4 = 0; // Syourscore
let perc4 = 0; // Spercentile
let min5 = 0; // Bxmin
let max5 = 0; // Bxmax
let mid5 = 0; //Bxaverage
let res5 = 0; // Byourscore
let perc5 = 0; // Bpercentile
let overlap = false;
let someOverlap = false;
Expand Down Expand Up @@ -106,6 +109,32 @@
}
onMount(() => {
reportData = service.getReport(undefined);
min1 = reportData.G0xmin;
max1 = reportData.G0xmax;
mid1 = reportData.G0xaverage;
res1 = reportData.G0yourscore;
perc1 = reportData.G0percentile;
min2 = reportData.G1xmin;
max2 = reportData.G1xmax;
mid2 = reportData.G1xaverage;
res2 = reportData.G1yourscore;
perc2 = reportData.G1percentile;
min3 = reportData.G2xmin;
max3 = reportData.G2xmax;
mid3 = reportData.G2xaverage;
res3 = reportData.G2yourscore;
perc3 = reportData.G2percentile;
min4 = reportData.Sxmin;
max4 = reportData.Sxmax;
mid4 = reportData.Sxaverage;
res4 = reportData.Syourscore;
perc4 = reportData.Spercentile;
min5 = reportData.Bxmin;
max5 = reportData.Bxmax;
mid5 = reportData.Bxaverage;
res5 = reportData.Byourscore;
perc5 = reportData.Bpercentile;
if (res1 > mid1 && res2 < mid2 && res3 < mid3 && res4 < mid4 && res5 > mid5) {
overlap = true;
return;
Expand Down
Loading

0 comments on commit 187a955

Please sign in to comment.