Merge pull request #49 from WINBIGFOX/bugfix/project-stopping

WINBIGFOX · web-flow · commit e0c42fa01792 · 2025-07-24T19:17:57.000+02:00
Bugfix/project stopping
diff --git a/app/Http/Controllers/MenubarController.php b/app/Http/Controllers/MenubarController.php
@@ -99,6 +99,10 @@ public function removeProject(ProjectSettings $projectSettings)
         $projectSettings->currentProject = null;
         $projectSettings->save();
 
+        if (TimestampService::getCurrentType() === TimestampTypeEnum::WORK) {
+            TimestampService::startWork();
+        }
+
         return redirect()->route('menubar.index');
     }
 }
diff --git a/resources/js/Pages/MenuBar.vue b/resources/js/Pages/MenuBar.vue
@@ -247,24 +247,10 @@ const removeProject = () => {
                         <div class="line-clamp-1">
                             {{ props.currentProject.name }}
                         </div>
-                        <Button
-                            :as="Link"
-                            :href="route('menubar.storeStop')"
-                            class="text-destructive hover:text-destructive mr-0.5 ml-auto px-2! shadow-none"
-                            method="post"
-                            preserve-scroll
-                            preserve-state
-                            size="sm"
-                            v-if="currentType === 'work'"
-                            variant="outline"
-                        >
-                            <Square class="size-4" />
-                        </Button>
                         <Button
                             @click="removeProject"
                             class="mr-0.5 ml-auto px-2! shadow-none"
                             size="sm"
-                            v-if="currentType !== 'work'"
                             variant="outline"
                         >
                             <X class="size-4" />
@@ -290,7 +276,6 @@ const removeProject = () => {
                         </Button>
                     </div>
                     <div class="scroll-shadow-y flex grow flex-col gap-1 overflow-y-auto">
-                        <!-- Einzelne Projekte (mit parent_id aber Parent nicht geladen) -->
                         <template :key="project.id" v-for="project in props.projects">
                             <div
                                 :style="'--project-color: ' + (project.color ?? '#000000')"
diff --git a/resources/js/Pages/Project/Edit.vue b/resources/js/Pages/Project/Edit.vue
@@ -47,7 +47,7 @@ const submit = () => {
 </script>
 
 <template>
-    <Head title="Projekt bearbeiten" />
+    <Head title="Projekt edit" />
     <SheetDialog
         :close="$t('app.cancel')"
         :submit="$t('app.save')"

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,10 @@ public function removeProject(ProjectSettings $projectSettings)`
`99`	`99`	`$projectSettings->currentProject = null;`
`100`	`100`	`$projectSettings->save();`
`101`	`101`
	`102`	`+ if (TimestampService::getCurrentType() === TimestampTypeEnum::WORK) {`
	`103`	`+ TimestampService::startWork();`
	`104`	`+ }`
	`105`	`+`
`102`	`106`	`return redirect()->route('menubar.index');`
`103`	`107`	`}`
`104`	`108`	`}`