root/rasp_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

request date fix

Browse Source
This commit is contained in:
relaxed 2024-08-28 19:13:43 +05:00
parent fbe65305e2
commit 33a011d723
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/App.svelte
View File

@ -76,11 +76,16 @@
} }
function get_rasp() { function get_rasp() {
const startDate = `${start_date.getDate()}.${start_date.getMonth() + 1}.${start_date.getFullYear()}`; const s_date = start_date.getDate();
const s_month = start_date.getMonth() + 1;
const startDate = `${s_date < 10 ? 0 : ""}${s_date}.${s_month < 10 ? 0 : ""}${s_month}.${start_date.getFullYear()}`;
end_date = new Date(start_date); end_date = new Date(start_date);
end_date.setDate(start_date.getDate() + 6); end_date.setDate(start_date.getDate() + 6);
end_date.setHours(23, 59, 59, 999); end_date.setHours(23, 59, 59, 999);
const endDate = `${end_date.getDate()}.${end_date.getMonth() + 1}.${end_date.getFullYear()}`;
const e_date = end_date.getDate();
const e_month = end_date.getMonth() + 1;
const endDate = `${e_date < 10 ? 0 : ""}${e_date}.${e_month < 10 ? 0 : ""}${e_month}.${end_date.getFullYear()}`;
const date_full = `${startDate}-${endDate}`; const date_full = `${startDate}-${endDate}`;
@ -208,7 +213,7 @@
class="p-2 class="p-2
flex justify-between items-center flex justify-between items-center
{i === data.saved.length - 1 ? '' : 'border-b-2'} {i === data.saved.length - 1 ? '' : 'border-b-2'}
border-[var(--w-border)] dark:border-[var(--b-border)]" border-[var(--w-border)] dark:border-[var(--b-border)]"
> >
<p>{info.name}</p> <p>{info.name}</p>
<button <button
@ -221,7 +226,7 @@
<img <img
src="/x.svg" src="/x.svg"
class="min-w-[40px] min-h-[40px] size-[40px] transition-all class="min-w-[40px] min-h-[40px] size-[40px] transition-all
border-2 border-[var(--w-red)] dark:border-[var(--b-red)]" border-2 border-[var(--w-red)] dark:border-[var(--b-red)]"
alt="data not loaded" alt="data not loaded"
/> />
</button> </button>
@ -232,8 +237,8 @@
<h1 class="mx-2 mt-10">Добавить</h1> <h1 class="mx-2 mt-10">Добавить</h1>
<select <select
class="min-h-[60px] p-2 m-2 w-atuo class="min-h-[60px] p-2 m-2 w-atuo
bg-[var(--w-bg)] dark:bg-[var(--b-bg)] bg-[var(--w-bg)] dark:bg-[var(--b-bg)]
border-[1px] border-[var(--w-border)] dark:border-[var(--b-border)]" border-[1px] border-[var(--w-border)] dark:border-[var(--b-border)]"
on:change={(event) => { on:change={(event) => {
search_type = event.target.value; search_type = event.target.value;
search_value = ""; search_value = "";
@ -277,9 +282,9 @@
{#each search_data as item, i} {#each search_data as item, i}
<div <div
class="p-2 class="p-2
flex justify-between items-center flex justify-between items-center
{i === search_data.length - 1 ? '' : 'border-b-2'} {i === search_data.length - 1 ? '' : 'border-b-2'}
border-[var(--w-border)] dark:border-[var(--b-border)]" border-[var(--w-border)] dark:border-[var(--b-border)]"
> >
{#if search_type === "teacher-list"} {#if search_type === "teacher-list"}
<p>{item.label}</p> <p>{item.label}</p>
@ -473,7 +478,7 @@
<div class="overflow-y-auto"> <div class="overflow-y-auto">
<p <p
class="break-words h-auto class="break-words h-auto
text-2xl text-[var(--w-text)] dark:text-[var(--b-text)]" text-2xl text-[var(--w-text)] dark:text-[var(--b-text)]"
> >
У вас нету сохраненных расписаний, добавтье их в <button У вас нету сохраненных расписаний, добавтье их в <button
class="underline" class="underline"
@ -493,9 +498,9 @@
<div id={`${i}`} class="p-2 min-w-[300px]"> <div id={`${i}`} class="p-2 min-w-[300px]">
<div <div
class="flex p-2 mb-2 class="flex p-2 mb-2
border-[1px] border-[var(--w-border)] dark:border-[var(--b-border)] border-[1px] border-[var(--w-border)] dark:border-[var(--b-border)]
text-[var(--w-text)] dark:text-[var(--b-text)] text-[var(--w-text)] dark:text-[var(--b-text)]
{day.isCurrentDate === 1 ? 'bg-[var(--w-red)] dark:bg-[var(--b-red)]' : ''}" {day.isCurrentDate === 1 ? 'bg-[var(--w-red)] dark:bg-[var(--b-red)]' : ''}"
> >
<h1> <h1>
<pre>{day.date} - {day.weekDay}</pre> <pre>{day.date} - {day.weekDay}</pre>
@ -504,8 +509,8 @@
<div class="relative z-0 h-[calc(100svh-192px)]"> <div class="relative z-0 h-[calc(100svh-192px)]">
<div <div
class="h-full w-full z-0 absolute overflow-y-auto overflow-x-hidden class="h-full w-full z-0 absolute overflow-y-auto overflow-x-hidden
flex flex-col justify-start items-center flex flex-col justify-start items-center
" "
> >
{#if day.pairs.every((p) => p.schedulePairs.length === 0)} {#if day.pairs.every((p) => p.schedulePairs.length === 0)}
<div <div