Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pgkn",
"private": true,
"version": "1.4.2",
"version": "1.5.0",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
Binary file added public/gifs/dropping_soon.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 46 additions & 12 deletions src/main/scala/pgkn/pages/KaptenAlloc.scala
Original file line number Diff line number Diff line change
Expand Up @@ -97,31 +97,57 @@ object KaptenAlloc:
selectedId: Option[String]
): HtmlElement =
val searchQuery = Var("")
val showPassed = Var(selectedId.isDefined)
val showTodayOnly = Var(false)
val caseSensitive = Var(false)
val showToast = Var(false)

val timeFilteredEntries =
KaptenAllocDataService.entries
.combineWith(showPassed.signal)
.map((entries, showPassedSessions) =>
if showPassedSessions then entries
.combineWith(showTodayOnly.signal)
.map((entries, showTodayOnly) =>
if !showTodayOnly then entries
else
val now = new js.Date().getTime()
entries.filter(_.time.toDouble >= now)
val startOfToday =
val d = new js.Date();
d.setHours(0,0,0,0);
d.getTime();
val endOfToday =
val d = new js.Date();
d.setHours(23,59,59,59);
d.getTime();
entries.filter(entry =>
entry.time.toDouble >= startOfToday &&
entry.time.toDouble <= endOfToday
)
)


val formattedEntries = timeFilteredEntries.map(_.map(_.toFormatted))

val filteredFormattedEntries =
formattedEntries
.combineWith(searchQuery.signal)
.map((entries, query) =>
.combineWith(caseSensitive.signal)
.map((entries, query, isCaseSensitive) =>
if query.trim.isEmpty then entries
else
val terms = query.toLowerCase.split("\\s+").filter(_.nonEmpty)
val terms = if isCaseSensitive then
query.split("\\s+").filter(_.nonEmpty)
else
query.toLowerCase.split("\\s+").filter(_.nonEmpty)
entries.filter(entry =>
terms.forall(term =>
entry.entryType.toLowerCase.contains(term) ||
if isCaseSensitive then
entry.entryType.contains(term) ||
entry.dateStr.contains(term) ||
entry.weekNum.contains(term) ||
entry.dayStr.contains(term) ||
entry.timeStr.contains(term) ||
entry.group.contains(term) ||
entry.room.contains(term) ||
entry.supervisor.contains(term)
else
entry.entryType.toLowerCase.contains(term) ||
entry.dateStr.toLowerCase.contains(term) ||
entry.weekNum.toLowerCase.contains(term) ||
entry.dayStr.toLowerCase.contains(term) ||
Expand Down Expand Up @@ -212,10 +238,18 @@ object KaptenAlloc:
label(
input(
typ := "checkbox",
checked <-- showPassed.signal,
onInput.mapToChecked --> showPassed
checked <-- showTodayOnly.signal,
onInput.mapToChecked --> showTodayOnly
),
span("Idag?")
),
label(
input(
typ := "checkbox",
checked <-- caseSensitive.signal,
onInput.mapToChecked --> caseSensitive
),
span("Inkludera passerade tider")
span("Versalkänslig")
)
),
div(
Expand Down
5 changes: 4 additions & 1 deletion src/main/scala/pgkn/pages/Sigrid.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ object Sigrid:
mainTag(
NavHeader(router),
div(
p("Sigrid: Coming soon")
styleAttr := "display: flex; justify-self: center;",
img(src:="/gifs/dropping_soon.gif",
width:= "30rem"
)
)
)