diff --git a/makefile b/makefile index 8386de2..05a181c 100644 --- a/makefile +++ b/makefile @@ -6,14 +6,10 @@ all: container # for dev dev_image: - # cd ./docker_dev sudo docker build --no-cache -t rasp_web/dev_mode ./docker_dev - # cd .. dev_amd_image: - # cd ./docker_dev sudo docker build --platform linux/amd64 --no-cache -t rasp_web/dev_mode ./docker_dev - # cd .. dev_container: sudo docker run -d -p 80:80 --name rasp_web_dev_mode rasp_web/dev_mode diff --git a/src/App.svelte b/src/App.svelte index af0b382..0ef3d52 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -1,7 +1,8 @@
+ import Pair from "./Pair.svelte"; + export let rasp_data = []; + export let is_rasp_data_loading = false; + export let is_rasp_cache_loaded = false; + export let is_rasp_data_loaded = false; + + +{#each rasp_data as day, i} +
+
+

+
{day.date} - {day.weekDay}
+

+
+
+
+ {#if day.pairs.every((p) => p.schedulePairs.length === 0)} +
+ {#if !is_rasp_data_loading && !is_rasp_cache_loaded && !is_rasp_data_loaded} + Ошибка получения данных попробуйте позже + {:else if is_rasp_data_loading} + Загрузка .... + {:else if is_rasp_data_loaded || is_rasp_cache_loaded} + have a good day + {/if} +
+ {:else} + {#each day.pairs as pairs} + + {/each} + {/if} +
+
+
+{/each} diff --git a/src/lib/Pair.svelte b/src/lib/Pair.svelte index 2a88dfc..54489de 100644 --- a/src/lib/Pair.svelte +++ b/src/lib/Pair.svelte @@ -1,5 +1,44 @@ {#if pairs.schedulePairs.length === 1} @@ -21,55 +60,64 @@ {pairs.schedulePairs[0].subject}

- aud: {pairs.schedulePairs[0].aud} + {pairs.schedulePairs[0].aud} + + {pairs.schedulePairs[0].teacher} +

- - {pairs.schedulePairs[0].teacher} -

{pairs.schedulePairs[0].group}

{:else if pairs.schedulePairs.length > 1} - {@const end_index = pairs.schedulePairs.length - 1} + {@const normalized = normalize_many_pairs(pairs)} + {@const end_index = normalized.length - 1}

{pairs.N}) {pairs.time.replace("-", " - ")}

- {#each pairs.schedulePairs as pair, i} + {#each normalized as pair, i}

- {pair.subject} + {pair.name}

- aud: {pair.aud} -

- - {pair.teacher} - -

- {pair.group} + Ауд: {pair.aud}

+
+ {#each pair.teachers as teacher} + + {teacher} + + {/each} +
+ +
+ {#each pair.groups as group} +

+ {group} +

+ {/each} +
{/each}
diff --git a/src/lib/Vertical.svelte b/src/lib/Vertical.svelte new file mode 100644 index 0000000..1a797aa --- /dev/null +++ b/src/lib/Vertical.svelte @@ -0,0 +1,46 @@ + + +{#each rasp_data as day, i} +
+
+

+
{day.date} - {day.weekDay}
+

+
+
+
+ {#if day.pairs.every((p) => p.schedulePairs.length === 0)} +
+ {#if !is_rasp_data_loading && !is_rasp_cache_loaded && !is_rasp_data_loaded} + Ошибка получения данных попробуйте позже + {:else if is_rasp_data_loading} + Загрузка .... + {:else if is_rasp_data_loaded || is_rasp_cache_loaded} + have a good day + {/if} +
+ {:else} + {#each day.pairs as pairs} + + {/each} + {/if} +
+
+
+{/each}