diff --git a/lang/en_us.php b/lang/en_us.php
index c63c33b..35124db 100644
--- a/lang/en_us.php
+++ b/lang/en_us.php
@@ -60,6 +60,8 @@ define("STRINGS", [
"friday" => "Friday",
"saturday" => "Saturday",
"show all shifts" => "Show all shifts",
+ "showing all shifts" => "Showing all shifts",
+ "show only my shifts" => "Show only my shifts",
"new shift" => "New Shift",
"edit shift" => "Edit Shift",
"shift added" => "Shift added.",
diff --git a/pages/shifts.php b/pages/shifts.php
index 36ae7ce..69a0011 100644
--- a/pages/shifts.php
+++ b/pages/shifts.php
@@ -16,16 +16,20 @@ $totalpunches = count($punches);
?>
-
-
+
+
@@ -56,4 +60,5 @@ if (account_has_permission($_SESSION['username'], "QWIKCLOCK_MANAGE")) {
* it needs to inject the filter checkbox
*/
var lang_show_all_shifts = "";
+ var lang_show_my_shifts = "";
\ No newline at end of file
diff --git a/static/css/app.css b/static/css/app.css
index dafcb90..7049ef4 100644
--- a/static/css/app.css
+++ b/static/css/app.css
@@ -73,6 +73,11 @@
text-align: center;
}
+#showing-all {
+ display: inline-block;
+ margin-left: 10px;
+}
+
/*
==============================
THEMING
diff --git a/static/js/shifts.js b/static/js/shifts.js
index d51483e..a016f08 100644
--- a/static/js/shifts.js
+++ b/static/js/shifts.js
@@ -35,15 +35,24 @@ var shifttable = $('#shifttable').DataTable({
ajax: {
url: "lib/getshifttable.php",
data: function (d) {
- if ($('#show_all_checkbox').is(':checked')) {
+ if ($('#show_btn').data("showall") == 1) {
d.show_all = 1;
}
},
}
});
-$('#shifttable_filter').append("");
-
-$('#show_all_checkbox').click(function () {
+$('#show_btn').click(function () {
+ if ($('#show_btn').data("showall") == 1) {
+ $('#show_btn').data("showall", "");
+ $('#showing-all').css("display", "none");
+ $('#show_btn span').text(lang_show_all_shifts);
+ } else {
+ $('#show_btn').data("showall", "1");
+ $('#showing-all').css("display", "inline-block");
+ $('#show_btn span').text(lang_show_my_shifts);
+ }
shifttable.ajax.reload();
-});
\ No newline at end of file
+});
+
+$('#showing-all').css("display", "none");
\ No newline at end of file