nreunane/hour-tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: nreunane:6498a181c8d258b4827370c4c7c64c162e6572e6
Branches Tags
nreunane:main
..
compare: nreunane:a96ac9fbe161d392dc36627e4b85ab80bb0fa17b
Branches Tags
nreunane:main

No commits in common. "6498a181c8d258b4827370c4c7c64c162e6572e6" and "a96ac9fbe161d392dc36627e4b85ab80bb0fa17b" have entirely different histories.
6498a181c8 ... a96ac9fbe1

5 changed files with 81 additions and 142 deletions
Show stats Expand all files Collapse all files

1
.gitignore vendored
View file

@ -13,7 +13,6 @@ dist-ssr
*.local
# Editor directories and files
.vscode
.vscode/*
!.vscode/extensions.json
.idea

52
back-end/main.go
View file

@ -15,17 +15,10 @@ import (
)
type Entry struct {
Project string
Start string
End string
}
type Project struct {
Id string
Identifier string
Name string
}
func main() {
app := pocketbase.New()
@ -35,7 +28,6 @@ func main() {
month := c.PathParam("month")
organisation := c.PathParam("organisation")
projects := []Project{}
entries := []Entry{}
record, _ := c.Get(apis.ContextAuthRecordKey).(*models.Record)
@ -45,20 +37,6 @@ func main() {
}
err := app.Dao().DB().
NewQuery("SELECT * FROM projects WHERE organisation = {:organisation}").
Bind(dbx.Params{
"start": fmt.Sprintf("%s-%s-01 00:00:00.000Z", year, month),
"end": fmt.Sprintf("%s-%s-31 23:59:59.999Z", year, month),
"organisation": organisation,
"user": record.Id,
}).
All(&projects)
if err != nil {
return c.JSON(http.StatusOK, map[string]any{"hours": nil, "error": err})
}
err = app.Dao().DB().
NewQuery("SELECT * FROM entries WHERE user = {:user} AND start >= {:start} AND end <= {:end} AND end != '' AND project IN (SELECT id FROM projects WHERE organisation = {:organisation})").
Bind(dbx.Params{
"start": fmt.Sprintf("%s-%s-01 00:00:00.000Z", year, month),
@ -69,45 +47,25 @@ func main() {
All(&entries)
if err != nil {
return c.JSON(http.StatusOK, map[string]any{"hours": nil, "error": err})
return c.JSON(http.StatusOK, map[string]any{"hours": 0, "error": err})
}
var projects_map map[string]string
projects_map = make(map[string]string)
for _, e := range projects {
projects_map[e.Id] = fmt.Sprintf("(%s) %s", e.Identifier, e.Name)
}
var hours map[string]float64
hours = make(map[string]float64)
hours := 0.0
for _, e := range entries {
start, err := time.Parse("2006-01-02 15:04:05.000Z", e.Start)
if err != nil {
return c.JSON(http.StatusOK, map[string]any{"hours": nil, "error": fmt.Sprintf("time.Parse(%s)", e.Start)})
return c.JSON(http.StatusOK, map[string]any{"hours": 0, "error": fmt.Sprintf("time.Parse(%s)", e.Start)})
}
end, err := time.Parse("2006-01-02 15:04:05.000Z", e.End)
if err != nil {
return c.JSON(http.StatusOK, map[string]any{"hours": nil, "error": fmt.Sprintf("time.Parse(%s)", e.End)})
return c.JSON(http.StatusOK, map[string]any{"hours": 0, "error": fmt.Sprintf("time.Parse(%s)", e.End)})
}
var entry_hours = end.Sub(start).Hours()
project, project_exists := projects_map[e.Project]
if !project_exists {
return c.JSON(http.StatusOK, map[string]any{"hours": nil, "error": fmt.Sprintf("time.Parse(%s)", e.End)})
}
if value, total_entry_exists := hours[project]; total_entry_exists {
hours[project] = value + entry_hours
} else {
hours[project] = entry_hours
}
hours = hours + end.Sub(start).Hours()
}
return c.JSON(http.StatusOK, map[string]any{"hours": hours, "error": nil})

18
front-end/src/App.vue
View file

@ -17,13 +17,13 @@ const date = ref(new Date());
const email = ref("");
const failedLogin = ref(false);
const isLogged = ref(pb.authStore.isValid);
const organisation = ref("");
const org = ref("");
const organisations = ref<Organisation[]>([]);
const password = ref("");
const projects = ref<Project[]>([]);
const toast = useToast();
watch(organisation, async () => {
watch(org, async () => {
await getProjects();
});
@ -59,7 +59,7 @@ async function logout() {
}
async function getProjects() {
const filter = pb.filter("organisation = {:organisation}", { organisation: organisation.value });
const filter = pb.filter("organisation = {:organisation}", { organisation: org.value });
const records = await pb.collection<Project>("projects").getFullList(500, {
filter,
@ -72,8 +72,8 @@ async function getProjects() {
async function getOrganisations() {
const records = await pb.collection<Organisation>("organisations").getFullList();
organisations.value = [...records];
if (organisation.value === "" && records.length > 0) {
organisation.value = records[0].id;
if (org.value === "" && records.length > 0) {
org.value = records[0].id;
}
}
@ -88,13 +88,13 @@ function setDate(newDate: Date) {
<template #center>
<template v-if="isLogged">
<Select
v-model="organisation"
v-model="org"
:options="organisations"
optionLabel="name"
optionValue="id"
placeholder="Organisation"
/>
<Controls @date="setDate" :projects="projects" :org="organisation" v-if="organisation !== ''" />
<Controls @date="setDate" :projects="projects" :org="org" v-if="org !== ''" />
</template>
</template>
<template #end>
@ -109,9 +109,9 @@ function setDate(newDate: Date) {
</template>
</Toolbar>
<EntryTable
:org="organisation"
:org="org"
:date="date"
:projects="projects"
v-if="isLogged && organisation !== ''"
v-if="isLogged && org !== ''"
/>
</template>

56
front-end/src/components/Controls.vue
View file

@ -6,16 +6,9 @@ import DatePicker from "primevue/datepicker";
import Dialog from "primevue/dialog";
import { inject, ref } from "vue";
const modalTotalHours = ref<{
hours: { [project: string]: number };
total: number;
visible: boolean;
}>({
hours: {},
total: 0,
visible: false,
});
const selectedDate = ref(new Date());
const date = ref(new Date());
const totalHours = ref(0);
const totalHoursVisible = ref(false);
const pb = inject("pb") as PocketBase;
const props = defineProps<{ org: string; projects: Project[] }>();
@ -23,29 +16,21 @@ const props = defineProps<{ org: string; projects: Project[] }>();
const emits = defineEmits<{ date: [Date]; project: [string] }>();
function setDate(offset: number) {
selectedDate.value = new Date(selectedDate.value.setDate(selectedDate.value.getDate() + offset));
emits("date", selectedDate.value);
date.value = new Date(date.value.setDate(date.value.getDate() + offset));
emits("date", date.value);
}
async function showModalTotalHours() {
const year = selectedDate.value.getFullYear();
const month = selectedDate.value.getMonth() + 1;
async function showTotalHours() {
const year = date.value.getFullYear();
const month = date.value.getMonth() + 1;
const monthDoubleDigit = month < 10 ? `0${month}` : month.toString();
const organisation = props.org;
const response = await pb.send(`/hours/${organisation}/${year}/${monthDoubleDigit}`, {});
console.log(response);
if (response.error === null) {
let total = 0.0;
modalTotalHours.value.hours = {};
for (const project of Object.keys(response.hours)) {
modalTotalHours.value.hours[project] = Math.round(response.hours[project] * 100.0) / 100.0;
total = total + modalTotalHours.value.hours[project];
}
modalTotalHours.value.total = total;
modalTotalHours.value.visible = true;
totalHours.value = Math.round(response.hours * 100) / 100;
totalHoursVisible.value = true;
} else {
console.error(response.error);
}
@ -54,21 +39,10 @@ async function showModalTotalHours() {
<template>
<Button label="<" @click="setDate(-1)" style="margin-left: 20px;" />
<DatePicker v-model="selectedDate" style="width: 150px; margin-left: 3px;" />
<Button label=">" @click="setDate(1)" style="margin-left: 3px;" />
<Button label="total hours" @click="showModalTotalHours" style="margin-left: 20px;" />
<Dialog v-model:visible="modalTotalHours.visible" modal header="Total hours">
<table style="width: 100%; border-collapse: collapse; border: 1px solid #ccc; font-family: Arial, sans-serif; font-size: 14px;">
<tbody>
<tr v-for="project in Object.keys(modalTotalHours.hours)">
<td style="border: 1px solid #ccc; padding: 8px;">{{ project }}</td>
<td style="border: 1px solid #ccc; padding: 8px;">{{ modalTotalHours.hours[project] }}</td>
</tr>
<tr>
<td style="border: 1px solid #ccc; padding: 8px; background: #f4f4f4; font-weight: bold;">Total hours</td>
<td style="border: 1px solid #ccc; padding: 8px; background: #f4f4f4; font-weight: bold;">{{ modalTotalHours.total }}</td>
</tr>
</tbody>
</table>
<DatePicker v-model="date" style="width: 150px;" />
<Button label=">" @click="setDate(1)" />
<Button label="Total hours" @click="showTotalHours" style="margin-left: 20px;" />
<Dialog v-model:visible="totalHoursVisible" modal header="Total hours" :style="{ width: '25rem' }">
<p>Hours: {{ totalHours }}</p>
</Dialog>
</template>

90
front-end/src/components/EntryTable.vue
View file

@ -30,17 +30,17 @@ const props = defineProps<{
projects: Project[];
}>();
const editingRows = ref([]);
const orgWatch = toRef(() => props.org);
const dateWatch = toRef(() => props.date);
const entries = ref<Entry[]>([]);
const editingRows = ref([]);
const newEntrySelection = ref("");
const watchDate = toRef(() => props.date);
const watchOrganisation = toRef(() => props.org);
watch(watchDate, () => {
watch(dateWatch, () => {
getEntries().then();
});
watch(watchOrganisation, () => {
watch(orgWatch, () => {
getEntries().then();
});
@ -49,36 +49,39 @@ onMounted(async () => {
});
const summaries = computed(() => {
const hours: { [key: string]: number } = {};
const e = entries.value.filter((el) => {
return el.end !== null && el.end.getTime() > el.start.getTime() && el.project !== "";
});
for (const entry of entries.value) {
if (
entry.end === null ||
entry.end.getTime() <= entry.start.getTime() ||
entry.project === ""
) {
continue;
const minutes: { [key: string]: number } = {};
for (const el of e) {
if (el.end !== null) {
const pid = el.project;
if (!(pid in minutes)) {
minutes[pid] = 0;
}
const end = new Date(el.end).getTime();
const start = new Date(el.start).getTime();
const elapsed = Math.round((end - start) / (1000 * 60));
minutes[pid] = minutes[pid] + elapsed;
}
}
const project_id = entry.project;
if (!(project_id in hours)) {
hours[project_id] = 0;
const result: { key: string; start: Date; end: Date }[] = [];
let cumsum = 0;
for (const key in minutes) {
const start = new Date(props.date.getTime());
start.setHours(8, 0, 0);
start.setMinutes(start.getMinutes() + cumsum);
cumsum += minutes[key];
const end = new Date(props.date.getTime());
end.setHours(8, 0, 0);
end.setMinutes(end.getMinutes() + cumsum);
result.push({ key, start, end });
}
const end = new Date(entry.end).getTime();
const start = new Date(entry.start).getTime();
const elapsed = Math.round(((end - start) / (1000 * 60 * 60)) * 100.0) / 100.0;
hours[project_id] = hours[project_id] + elapsed;
}
const out: { project_id: string; hours: number }[] = [];
for (const [project_id, total] of Object.entries(hours)) {
out.push({ project_id, hours: total });
}
return out;
return result;
});
const isEditorActive = computed(() => {
@ -146,13 +149,13 @@ function getDateFmt(date: Date | null): string {
return "";
}
const year = date.getFullYear();
const month = `0${date.getMonth()}`.slice(-2);
const date_str = date.getDate();
const hour = `0${date.getHours()}`.slice(-2);
const minute = `0${date.getMinutes()}`.slice(-2);
const hour = date.getHours();
const minute = date.getMinutes();
return `${date_str}/${month}/${year} ${hour}:${minute}`;
const hh = `0${hour.toString()}`.slice(-2);
const mm = `0${minute.toString()}`.slice(-2);
return `${hh}:${mm}`;
}
async function save(event: DataTableRowEditSaveEvent) {
@ -262,7 +265,7 @@ function projectTitleFormat(project: Project, titleLimit: number): string {
{{ getDateFmt(slotProps.data.start) }}
</template>
<template #editor="{ data, field }">
<DatePicker v-model="data[field]" showTime style="min-width: 100px;" />
<DatePicker v-model="data[field]" timeOnly style="min-width: 100px;" />
</template>
</Column>
<Column field="end" header="End">
@ -270,7 +273,7 @@ function projectTitleFormat(project: Project, titleLimit: number): string {
{{ getDateFmt(slotProps.data.end) }}
</template>
<template #editor="{ data, field }">
<DatePicker v-if="data[field]" v-model="data[field]" showTime style="min-width: 100px;" />
<DatePicker v-if="data[field]" v-model="data[field]" timeOnly style="min-width: 100px;" />
</template>
</Column>
<Column field="description" header="Description">
@ -296,12 +299,17 @@ function projectTitleFormat(project: Project, titleLimit: number): string {
<DataTable v-if="summaries.length > 0" :value="summaries">
<Column header="Project">
<template #body="slotProps">
{{ projectTitleFormat(getProjectById(slotProps.data.project_id), 60) }}
{{ projectTitleFormat(getProjectById(slotProps.data.key), 60) }}
</template>
</Column>
<Column header="Hours">
<Column header="Start">
<template #body="slotProps">
{{ slotProps.data.hours }}
{{ getDateFmt(slotProps.data.start) }}
</template>
</Column>
<Column header="End">
<template #body="slotProps">
{{ getDateFmt(slotProps.data.end) }}
</template>
</Column>
</DataTable>