merge: pull request #26 from marksxiety/chore/adjustments

PR: Chore/adjustments

Author: marksxiety

.env.example

@@ -64,4 +64,9 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
 VITE_APP_NAME="${APP_NAME}"
 
 AI_API_KEY=
-AI_MODEL=
+AI_MODEL=
+
+ADMIN_NAME=Admin
+ADMIN_EMAIL=admin@example.com
+ADMIN_EMPLOYEEID=ADMIN001
+ADMIN_PASSWORD=changeme

.gitignore

@@ -8,7 +8,6 @@
 .env
 .env.backup
 .env.production
-/setup/config.json
 .phpunit.result.cache
 Homestead.json
 Homestead.yaml

CHANGELOG.md

@@ -2,6 +2,55 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v1.6.0] - 2026-05-09
+
+### Added
+
+- `OrganizationUnitController` with store, update, and destroy endpoints
+- Admin CRUD routes for organization units behind `admin` middleware
+- Organization unit management section in admin settings page with add, edit, and delete
+- `HasScopedQueries` trait to scope queries by organization unit (returns `null` for admin)
+- User reassignment flow when deleting an organization unit
+- `calcHours` helper with per-item and total queue hours display
+- Scrollable form and queue panels with fixed height
+- `FloatingThemeToggle` component on login, register, forgot password, and reset password pages
+
+### Changed
+
+- Scoped user listing, overtime, dashboard, required hours, and schedule queries by org unit via `HasScopedQueries`
+- Admin users no longer scoped to an org unit (`organization_unit_id` set to `null`)
+- Removed hardcoded org unit from report date range form
+- Redesigned overtime queue cards with simplified styling and status badges
+- Converted `defaultShiftCodes` to computed, removed week remove button
+- Flattened admin System dropdown into direct Configuration link
+
+## [v1.5.0] - 2026-05-05
+
+### Added
+
+- `settings` database table and `Setting` model for system configuration
+- `SettingsController` with index and update endpoints
+- Admin settings page (`Admin/Settings.vue`) for managing shift codes, overtime rules, and system preferences
+- Admin dashboard (`Admin/Index.vue`) with the same overtime dashboard as approver
+- `admin-approver` middleware group allowing admin to access all approver routes
+- "System" dropdown in navigation visible only to admin users
+- Admin user seeder reading credentials from `ADMIN_*` environment variables
+- Default settings seeder (shift codes, minimum overtime hours, overtime minute step)
+
+### Changed
+
+- Migrated all configuration from `setup/config.json` to `settings` database table
+- `OvertimeCalculator` now reads `minimum_overtime_hours` from database instead of filesystem
+- Admin role is a superset of approver with additional system settings access
+- `/setup/config` endpoint now reads from `settings` table instead of JSON file
+- Restricted public registration to `employee` and `approver` roles only (admin created via seeder)
+- Rewrote `OvertimeCalculatorTest` and `OvertimeRequestValidationTest` to use database-backed settings
+
+### Removed
+
+- `make:config` artisan command (replaced by admin settings UI)
+- `setup/config.json` file dependency (replaced by database)
+
 ## [v1.4.1] - 2026-04-26
 
 ### Added

app/Console/Commands/MakeConfigCommand.php

@@ -12,17 +12,19 @@
 use Illuminate\Support\Facades\Password;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Validation\Rules\Password as PasswordRule;
+use App\Traits\HasScopedQueries;
 
 class AuthController extends Controller
 {
+    use HasScopedQueries;
     public function register(Request $request)
     {
 
         $data = $request->validate([
             'name' => 'required|string|max:255',
             'employeeid' => 'required|unique:users|string|max:255',
             'organization_unit_id' => 'required|exists:organization_units,id',
-            'role' => ['required', Rule::in(['employee', 'approver', 'admin'])],
+            'role' => ['required', Rule::in(['employee', 'approver'])],
             'email' => 'required|string|email|max:255|unique:users',
             'password' => 'required|string|min:8|confirmed',
         ], [
@@ -147,9 +149,14 @@ public function loadUserProfile()
     public function RegisteredUsers()
     {
         try {
-            $currentOrgUnitId = Auth::user()->organization_unit_id;
+            $orgUnitId = $this->getOrgUnitId();
+            $usersQuery = User::query()->orderBy('id', 'asc');
 
-            $users = User::query()->where('organization_unit_id', $currentOrgUnitId)->orderBy('id', 'asc')->get()
+            if ($orgUnitId !== null) {
+                $usersQuery->where('organization_unit_id', $orgUnitId);
+            }
+
+            $users = $usersQuery->get()
                 ->map(function ($user) {
                     $user->avatar_url = $user->avatar
                         ? Storage::url($user->avatar)

app/Http/Controllers/AuthController.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\OrganizationUnit;
+use App\Models\User;
+use Illuminate\Http\Request;
+
+class OrganizationUnitController extends Controller
+{
+    public function store(Request $request)
+    {
+        $validated = $request->validate([
+            'unit_path' => ['required', 'string', 'max:50', 'unique:organization_units,unit_path'],
+        ]);
+
+        OrganizationUnit::create($validated);
+
+        return redirect()->back()->with('message', 'Organization unit created successfully.');
+    }
+
+    public function update(Request $request, OrganizationUnit $organization_unit)
+    {
+        $validated = $request->validate([
+            'unit_path' => ['required', 'string', 'max:50', 'unique:organization_units,unit_path,' . $organization_unit->id],
+        ]);
+
+        $organization_unit->update($validated);
+
+        return redirect()->back()->with('message', 'Organization unit updated successfully.');
+    }
+
+    public function destroy(OrganizationUnit $organization_unit)
+    {
+        $validated = request()->validate([
+            'reassign_to' => ['required', 'integer', 'exists:organization_units,id'],
+        ]);
+
+        $fallback = OrganizationUnit::find($validated['reassign_to']);
+
+        if ($fallback->id === $organization_unit->id) {
+            return redirect()->back()->withErrors(['reassign_to' => 'Cannot reassign users to the unit being deleted.']);
+        }
+
+        User::where('organization_unit_id', $organization_unit->id)
+            ->update(['organization_unit_id' => $fallback->id]);
+
+        $organization_unit->delete();
+
+        return redirect()->back()->with('message', 'Organization unit deleted successfully. Affected users were reassigned to "' . $fallback->unit_path . '".');
+    }
+}