diff --git a/app/Http/Controllers/DailyReportController.php b/app/Http/Controllers/DailyReportController.php new file mode 100644 index 0000000..766b941 --- /dev/null +++ b/app/Http/Controllers/DailyReportController.php @@ -0,0 +1,42 @@ +user()->dailyReports() + ->orderBy('report_date', 'desc') + ->paginate(15); + + return view('reports.index', compact('reports')); + } + public function store(StoreDailyReportRequest $request) + { + $report = DailyReport::create([ + 'user_id' => auth()->id(), + 'report_date' => $request->report_date, + 'content' => $request->content, + ]); + + // If they used an override, optionally delete or mark it as used so it can't be reused + ReportOverride::where('user_id', auth()->id()) + ->where('report_date', $request->report_date) + ->delete(); + + $managementEmails = ['samuel@click-mobile.com']; + Mail::to($managementEmails)->send(new DailyReportSubmitted($report, auth()->user())); + + return response()->json([ + 'success' => true, + 'message' => 'Daily report submitted successfully.' + ]); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/OfficeLocationController.php b/app/Http/Controllers/OfficeLocationController.php index 7ecdb39..f14e637 100644 --- a/app/Http/Controllers/OfficeLocationController.php +++ b/app/Http/Controllers/OfficeLocationController.php @@ -6,6 +6,8 @@ use App\Models\OfficeLocation; use App\Models\StaffMember; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use App\Models\PublicHoliday; + class OfficeLocationController extends Controller { @@ -114,5 +116,14 @@ class OfficeLocationController extends Controller $document->delete(); return response()->json(['success' => true, 'message' => 'Document deleted.']); - } -} \ No newline at end of file + } + +} + +// Swift track malawi +// eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI3MTYiLCJvaWQiOjcxNiwidWlkIjoiNDU3OTIzYzgtYmNkMS00ZWJhLWI3NzYtMGYyOTJmNmYzNWM4IiwiYXBpZCI6NTcxLCJpYXQiOjE3ODg1MzYwMzgsImV4cCI6MjEyODUzNjAzOH0.xbcNFzMNcryMACwYjOQMfF4Q06S80ttH4gYrcbduekTRXQcE4LptFEmir7iyeshghXy-C7Jcqno4UCKRIVnNig + + + +// klick +// eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiI2OSIsIm9pZCI6NjksInVpZCI6IjEyMTdiMmE4LWNlYTYtNGE3ZC1hODlmLTFiODBhNDQxMzRjYSIsImFwaWQiOjQwMCwiaWF0IjoxNzI2NDc2MTc4LCJleHAiOjIwNjY0NzYxNzh9.7Yv2dyT3wEGz28ddFEMdEN0EsmD18hLSaHfNxIPCAskPjHFQ8819u5cLwfzNeZy5Xa3Xaz1ZNc66j0Fd8xSWDw \ No newline at end of file diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index d400c77..695a977 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -30,6 +30,7 @@ class ProfileController extends Controller 'photo' => 'nullable|image|mimes:jpg,jpeg,png|max:2048', ]); // Combine month and day if both are provided (e.g., "12-25") + if (!empty($request->birth_month) && !empty($request->birth_day)) { $validated['dob'] = $request->birth_month . '-' . $request->birth_day; } else { @@ -52,8 +53,6 @@ class ProfileController extends Controller return response()->json(['success' => true, 'message' => 'Profile updated successfully!']); } - // --- DEPENDENTS / EMERGENCY CONTACTS CRUD --- - public function storeDependent(Request $request) { $staff = StaffMember::where('email', auth()->user()->email)->firstOrFail(); diff --git a/app/Http/Controllers/PublicHolidaysController.php b/app/Http/Controllers/PublicHolidaysController.php new file mode 100644 index 0000000..794833d --- /dev/null +++ b/app/Http/Controllers/PublicHolidaysController.php @@ -0,0 +1,81 @@ +orderBy('holiday_date', 'asc') + ->get(); + + return response()->json($holidays); + } + + public function store(Request $request) + { + $validated = $request->validate([ + 'office_location_id' => 'required|exists:office_locations,id', + 'name' => 'required|string|max:255', + 'holiday_date' => 'required|date', + 'is_recurring' => 'boolean', + ]); + + $validated['is_recurring'] = $request->has('is_recurring'); + + PublicHoliday::create($validated); + + return response()->json(['success' => true]); + } + + public function destroy(PublicHoliday $holiday) + { + $holiday->delete(); + return response()->json(['success' => true]); + } + + public function importFromApi(Request $request, $officeId) + { + $location = OfficeLocation::findOrFail($officeId); + $year = $request->input('year', now()->year); + $countryCode = $request->input('country_code'); + + if (!$countryCode) { + return response()->json(['success' => false, 'message' => 'Country code missing.'], 400); + } + + $response = Http::get("https://date.nager.at/api/v3/PublicHolidays/{$year}/{$countryCode}"); + + if ($response->successful()) { + $apiHolidays = $response->json(); + $count = 0; + + foreach ($apiHolidays as $holiday) { + PublicHoliday::updateOrCreate( + [ + 'office_location_id' => $location->id, + 'holiday_date' => $holiday['date'], + ], + [ + 'name' => $holiday['name'], + 'is_recurring' => $holiday['fixed'] ?? false, + ] + ); + $count++; + } + + return response()->json([ + 'success' => true, + 'message' => "Successfully imported {$count} holidays." + ]); + } + + return response()->json(['success' => false, 'message' => 'Failed to fetch from API.'], 500); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/ReportOverrideController.php b/app/Http/Controllers/ReportOverrideController.php new file mode 100644 index 0000000..b4e5e3e --- /dev/null +++ b/app/Http/Controllers/ReportOverrideController.php @@ -0,0 +1,41 @@ +validate([ + 'user_id' => 'required|exists:staff_members,id', + 'report_date' => 'required|date', + 'hours_valid' => 'nullable|integer|min:1|max:72', + ]); + + $hoursValid = (int) ($request->input('hours_valid') ?? 24); + + ReportOverride::updateOrCreate( + [ + 'user_id' => $request->user_id, + 'report_date' => $request->report_date, + ], + [ + 'granted_by' => auth()->id(), + 'expires_at' => now()->addHours($hoursValid), + // 'expires_at' => now()->addHours($request->hours_valid ?? 24), + + ] + ); + + return response()->json([ + 'success' => true, + 'message' => 'Late submission override granted successfully.' + ]); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/StaffMembersController.php b/app/Http/Controllers/StaffMembersController.php index c59f3d0..ff64c52 100644 --- a/app/Http/Controllers/StaffMembersController.php +++ b/app/Http/Controllers/StaffMembersController.php @@ -17,7 +17,6 @@ class StaffMembersController extends Controller { $query = StaffMember::query(); - // 1. Search Filter if ($request->filled('search')) { $search = $request->search; $query->where(function($q) use ($search) { @@ -28,12 +27,11 @@ class StaffMembersController extends Controller }); } - // 2. Department Filter if ($request->filled('department_id')) { $query->where('department_id', $request->department_id); } - // 3. Status Filter + if ($request->filled('status')) { $query->where('status', $request->status); } @@ -41,15 +39,19 @@ class StaffMembersController extends Controller $staffMembers = $query->orderBy('name', 'asc')->paginate(12); $staffMembers->appends($request->query()); - // Fetch dynamic dropdown lists $departments = Department::orderBy('name', 'asc')->get(); $countries = Country::orderBy('en_short_name', 'asc')->get(); + $allstaffMembers = StaffMember::orderBy('name')->get(['id', 'name']); + // dd($staffMembers); + // dd(\Auth::user()->designation); $data = [ 'staffMembers' => $staffMembers, 'departments' => $departments, + 'allstaffMembers' => $allstaffMembers, 'countries' => $countries, ]; + return view('staff.index', $data); } diff --git a/app/Http/Requests/StoreDailyReportRequest.php b/app/Http/Requests/StoreDailyReportRequest.php new file mode 100644 index 0000000..bec39ea --- /dev/null +++ b/app/Http/Requests/StoreDailyReportRequest.php @@ -0,0 +1,48 @@ + 'required|date|before_or_equal:today', + 'content' => 'required|string', + ]; + } + + public function withValidator($validator) + { + $validator->after(function ($validator) { + $reportDate = Carbon::parse($this->report_date)->startOfDay(); + + // Calculate standard deadline: 48 hours from the end of the report date + $deadline = $reportDate->copy()->endOfDay()->addHours(48); + + if (now()->greaterThan($deadline)) { + // Check if a valid override exists + $hasOverride = ReportOverride::where('user_id', auth()->id()) + ->where('report_date', $this->report_date) + ->where('expires_at', '>', now()) + ->exists(); + + if (!$hasOverride) { + $validator->errors()->add( + 'report_date', + 'The 48-hour submission window for this date has expired. Please contact management for an override.' + ); + } + } + }); + } +} diff --git a/app/Mail/DailyReportSubmitted.php b/app/Mail/DailyReportSubmitted.php new file mode 100644 index 0000000..8ae82d3 --- /dev/null +++ b/app/Mail/DailyReportSubmitted.php @@ -0,0 +1,27 @@ +report = $report; + $this->user = $user; + } + + public function build() + { + return $this->subject('New Daily Report: ' . $this->user->name . ' - ' . $this->report->report_date->format('d M Y')) + ->view('emails.reports.submitted'); + } +} \ No newline at end of file diff --git a/app/Models/DailyReport.php b/app/Models/DailyReport.php new file mode 100644 index 0000000..ae273c6 --- /dev/null +++ b/app/Models/DailyReport.php @@ -0,0 +1,17 @@ + 'date', + ]; + public function user() + { + return $this->belongsTo(StaffMember::class); + } +} diff --git a/app/Models/OfficeLocation.php b/app/Models/OfficeLocation.php index d2b25f6..5145a10 100644 --- a/app/Models/OfficeLocation.php +++ b/app/Models/OfficeLocation.php @@ -29,4 +29,21 @@ class OfficeLocation extends Model { return $this->hasMany(OfficeLocationDocument::class, 'office_location_id'); } + public function holidays() + { + return $this->hasMany(PublicHoliday::class)->orderBy('holiday_date'); + } + public function isHoliday($date) + { + $parsedDate = \Carbon\Carbon::parse($date); + + return $this->holidays()->where(function($query) use ($parsedDate) { + $query->whereDate('holiday_date', $parsedDate->format('Y-m-d')) + ->orWhere(function($q) use ($parsedDate) { + $q->where('is_recurring', true) + ->whereMonth('holiday_date', $parsedDate->month) + ->whereDay('holiday_date', $parsedDate->day); + }); + })->exists(); + } } diff --git a/app/Models/PublicHoliday.php b/app/Models/PublicHoliday.php new file mode 100644 index 0000000..c9233d5 --- /dev/null +++ b/app/Models/PublicHoliday.php @@ -0,0 +1,20 @@ + 'date', + 'is_recurring' => 'boolean', + ]; + + public function location() + { + return $this->belongsTo(OfficeLocation::class, 'office_location_id'); + } +} diff --git a/app/Models/ReportOverride.php b/app/Models/ReportOverride.php new file mode 100644 index 0000000..e9237c0 --- /dev/null +++ b/app/Models/ReportOverride.php @@ -0,0 +1,10 @@ +hasMany(StaffDependent::class, 'staff_id'); } + public function dailyReports() { + return $this->hasMany(DailyReport::class, 'user_id'); + } + public function department(){ + return $this->hasOne('App\Models\Department', 'id', 'department_id'); + } // 4. Cast dates correctly protected $casts = [ // 'dob' => 'date', diff --git a/public/assets/js/client-index.js b/public/assets/js/client-index.js index eb14476..e59a646 100644 --- a/public/assets/js/client-index.js +++ b/public/assets/js/client-index.js @@ -270,6 +270,7 @@ $(document).ready(function() { window.location.href = base_url + "/clients/export?" + queryParams; }); + // Render Table Rows // Render Table Rows function renderTable(clients) { let html = ''; @@ -310,13 +311,22 @@ $(document).ready(function() { }); } - // Extract Account Manager name safely let amName = 'Unassigned'; if (client.account_manager && client.account_manager.name) { amName = client.account_manager.name; } + // CONDITIONAL EDIT BUTTON LOGIC + let editButtonHtml = ''; + if (typeof currentUserId !== 'undefined' && client.auth_user_id == currentUserId) { + editButtonHtml = ` + + `; + } + html += ` @@ -329,13 +339,13 @@ $(document).ready(function() { -
${client.contact_person || 'N/A'}
+
${client.contact_person || 'N/A'}
+
${client.email || 'N/A'}
+ ${amName} - -
${client.email || 'N/A'}
${servicesHtml} @@ -348,9 +358,7 @@ $(document).ready(function() { - + ${editButtonHtml} @@ -412,5 +420,5 @@ $(document).ready(function() { } // Call loadCountries on page load so it's ready for the create modal - loadCountries(); + loadCountries(); }); \ No newline at end of file diff --git a/public/assets/libs/jquery-3.7.1.min.js b/public/assets/libs/jquery-3.7.1.min.js new file mode 100644 index 0000000..798cc8b --- /dev/null +++ b/public/assets/libs/jquery-3.7.1.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="",le.option=!!xe.lastChild;var ke={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n",""]);var je=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="
",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0
+ @if(Auth::User()->id == $showclient->auth_user_id) + @endif
diff --git a/resources/views/emails/reports/submitted.blade.php b/resources/views/emails/reports/submitted.blade.php new file mode 100644 index 0000000..405f4e2 --- /dev/null +++ b/resources/views/emails/reports/submitted.blade.php @@ -0,0 +1,104 @@ + + + + + Daily Report Submitted + + + + + + \ No newline at end of file diff --git a/resources/views/layouts/masterbeta.blade.php b/resources/views/layouts/masterbeta.blade.php index bbba0f5..289cf81 100644 --- a/resources/views/layouts/masterbeta.blade.php +++ b/resources/views/layouts/masterbeta.blade.php @@ -43,6 +43,7 @@ @stack('styles') @@ -60,8 +61,10 @@ @stack('modals') - - + + + + diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php index 1fb4813..fe96771 100644 --- a/resources/views/layouts/partials/sidebar.blade.php +++ b/resources/views/layouts/partials/sidebar.blade.php @@ -39,6 +39,9 @@ + + Reports + Office Locations diff --git a/resources/views/offices/index.blade.php b/resources/views/offices/index.blade.php index 278ef61..cce004f 100644 --- a/resources/views/offices/index.blade.php +++ b/resources/views/offices/index.blade.php @@ -58,11 +58,16 @@ - @@ -142,6 +147,60 @@ + +
+
+
+
Public Holidays
+
Loading...
+
+ +
+
+ + + + + +
+
Add Custom / Local Holiday
+ +
+
+ +
+
+ +
+
+
+ + +
+ +
+
+
+ + +
Current Holidays
+
+ + + + +
+
+
+
@endpush @push('scripts') @@ -228,6 +287,112 @@ } }); }); + // -- HOLIDAYS OFFCANVAS LOGIC -- + const holidaysOffcanvas = new bootstrap.Offcanvas(document.getElementById('holidaysOffcanvas')); + let currentHolidayLocationId = null; + let currentCountryCode = null; + + // 1. Open Offcanvas & Load Data + $('.btn-manage-holidays').on('click', function(e) { + e.preventDefault(); + currentHolidayLocationId = $(this).data('id'); + currentCountryCode = $(this).data('country-code'); + console.log(currentHolidayLocationId); + + $('#holidaysLocationName').text($(this).data('location')); + $('#holiday_location_id').val(currentHolidayLocationId); + + loadHolidays(); + holidaysOffcanvas.show(); + }); + + // 2. Fetch Data via AJAX + function loadHolidays() { + $('#holidaysListBody').html(''); + + // Ensure you have a route set up in web.php like: Route::get('/offices/{id}/holidays', [OfficeController::class, 'getHolidays']); + $.get("{{ url('offices') }}/" + currentHolidayLocationId + "/holidays", function(holidays) { + let html = ''; + if (holidays.length === 0) { + html = 'No holidays added yet.'; + } else { + holidays.forEach(h => { + let dateObj = new Date(h.holiday_date); + let formattedDate = dateObj.toLocaleDateString('en-GB', { day: 'numeric', month: 'short', year: 'numeric' }); + let recurringBadge = h.is_recurring ? 'Recurring' : ''; + + html += ` + + ${formattedDate} + ${h.name} ${recurringBadge} + + + + + `; + }); + } + $('#holidaysListBody').html(html); + }); + } + + // 3. Add Custom Holiday + $('#addHolidayForm').on('submit', function(e) { + e.preventDefault(); + let $btn = $(this).find('button[type="submit"]'); + $btn.prop('disabled', true).html(''); + + $.ajax({ + url: "{{ url('holidays') }}", // Adjust to your store route + type: 'POST', + data: $(this).serialize() + '&_token={{ csrf_token() }}', + success: function() { + $('#addHolidayForm')[0].reset(); + loadHolidays(); + }, + complete: function() { $btn.prop('disabled', false).text('Add'); } + }); + }); + + // 4. Delete Holiday + $(document).on('click', '.btn-delete-holiday', function() { + let id = $(this).data('id'); + if(confirm('Remove this holiday?')) { + $.ajax({ + url: "{{ url('holidays') }}/" + id, + type: 'DELETE', + data: { _token: '{{ csrf_token() }}' }, + success: function() { loadHolidays(); } + }); + } + }); + + // 5. Auto-Fetch API Holidays + $('#btnFetchApiHolidays').on('click', function() { + let $btn = $(this); + let originalText = $btn.html(); + $btn.prop('disabled', true).html(''); + + $.ajax({ + url: "{{ url('offices') }}/" + currentHolidayLocationId + "/holidays/import", + type: 'POST', + data: { _token: '{{ csrf_token() }}', year: new Date().getFullYear(), country_code: currentCountryCode }, + success: function(res) { + Swal.fire({ icon: 'success', title: 'Imported!', text: res.message, timer: 2000, showConfirmButton: false }); + loadHolidays(); + }, + error: function() { + Swal.fire('Error', 'Ensure the location has a valid ISO Country Code (e.g., GH).', 'error'); + }, + complete: function() { $btn.prop('disabled', false).html(originalText); } + }); + }); }); -@endpush \ No newline at end of file +@endpush + + + + + + diff --git a/resources/views/reports/index.blade.php b/resources/views/reports/index.blade.php new file mode 100644 index 0000000..46fad71 --- /dev/null +++ b/resources/views/reports/index.blade.php @@ -0,0 +1,216 @@ +@extends('layouts.masterbeta') + +@section('title', 'Click ERP - My Daily Reports') + +@section('breadcrumbs') + + + Daily Reports +@endsection + +@section('content') +
+
+

My Daily Reports

+

Submit and track your daily activity and progress.

+
+ +
+ +
+
+ + + + + + + + + + + @forelse($reports as $report) + + + + + + + @empty + + + + @endforelse + +
Report DateContent PreviewSubmitted AtAction
+ + {{ \Carbon\Carbon::parse($report->report_date)->format('D, d M Y') }} + + {{ Str::limit(strip_tags($report->content), 80) }} + + {{ $report->created_at->format('d M Y, H:i') }} + + +
+ + No reports submitted yet. +
+
+ @if($reports->hasPages()) + + @endif +
+@endsection + +@push('modals') + + + + + +@endpush + +@push('scripts') + +@endpush \ No newline at end of file diff --git a/resources/views/staff/index.blade.php b/resources/views/staff/index.blade.php index 227553d..7a5ec81 100644 --- a/resources/views/staff/index.blade.php +++ b/resources/views/staff/index.blade.php @@ -33,9 +33,16 @@

Manage employee profiles, department roles, and system access.

+ @if(strtolower(Auth::user()->department->name) == 'directors') + + @endif + @if(in_array(strtolower(Auth::user()->department->name) , ['directors', 'human resource'])) + @endif
@@ -264,82 +271,141 @@ -