diff --git a/CHANGELOG.md b/CHANGELOG.md index 935de82..385d09a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # v0.9.13 +- Add date restriction dropdown to range page - Fix dates not rendering properly in table - Update deps diff --git a/assets/js/app.js b/assets/js/app.js index 436cbc8..e920f0e 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -25,6 +25,7 @@ import 'phoenix_html' import { Socket } from 'phoenix' import { LiveSocket } from 'phoenix_live_view' import Date from './date' +import DateRange from './date_range' import DateTime from './datetime' import ShotLogChart from './shot_log_chart' import SlimSelect from './slim_select' @@ -33,7 +34,7 @@ import topbar from 'topbar' const csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute('content') const liveSocket = new LiveSocket('/live', Socket, { params: { _csrf_token: csrfToken }, - hooks: { Date, DateTime, ShotLogChart, SlimSelect } + hooks: { Date, DateRange, DateTime, ShotLogChart, SlimSelect } }) // Show progress bar on live navigation and form submits diff --git a/assets/js/date_range.js b/assets/js/date_range.js new file mode 100644 index 0000000..fd4109f --- /dev/null +++ b/assets/js/date_range.js @@ -0,0 +1,28 @@ +import { easepick } from '@easepick/core' +import { RangePlugin } from '@easepick/range-plugin' + +export default { + displayDateRange (el) { + // eslint-disable-next-line new-cap + el.easepick = new easepick.create({ + element: el.firstElementChild, + css: [ + 'https://cdn.jsdelivr.net/npm/@easepick/core@1.2.1/dist/index.css', + 'https://cdn.jsdelivr.net/npm/@easepick/range-plugin@1.2.1/dist/index.css' + ], + plugins: [RangePlugin], + RangePlugin: { + elementEnd: el.lastElementChild, + startDate: el.dataset.startDate, + endDate: el.dataset.endDate + }, + setup (picker) { + picker.on('select', (e) => { + el.firstElementChild.dispatchEvent(new Event('input', { bubbles: true })) + }) + } + }) + }, + mounted () { this.displayDateRange(this.el) }, + updated () { this.displayDateRange(this.el) } +} diff --git a/assets/package-lock.json b/assets/package-lock.json index b4963b0..a5e6768 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -6,6 +6,7 @@ "": { "license": "MIT", "dependencies": { + "@easepick/bundle": "^1.2.1", "@fortawesome/fontawesome-free": "^6.7.2", "chart.js": "^4.4.7", "chartjs-adapter-date-fns": "^3.0.0", @@ -2766,6 +2767,102 @@ "node": ">=14.17.0" } }, + "node_modules/@easepick/amp-plugin": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@easepick/amp-plugin/-/amp-plugin-1.2.1.tgz", + "integrity": "sha512-LbGd7RU+fiucxTqJnBpT5SwACX1BoEK4yi1joLqN50O57jpN0jQMMvDO/vp/F4Zr8MO6kwaamRmOXhqo/Vb4aw==", + "license": "GPL-2.0-or-later", + "dependencies": { + "@easepick/base-plugin": "^1.1.0" + } + }, + "node_modules/@easepick/base-plugin": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@easepick/base-plugin/-/base-plugin-1.2.1.tgz", + "integrity": "sha512-aonBQaRyZwNH/gmPzSzZDVjQjgy/rxWd+TXnM0E3Nxkeu4yMbXV+GnWVQbBwTvJx74M7iSCHJowdmZ5T46B7Vg==", + "license": "GPL-2.0-or-later", + "dependencies": { + "@easepick/core": "^1.1.0" + } + }, + "node_modules/@easepick/bundle": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@easepick/bundle/-/bundle-1.2.1.tgz", + "integrity": "sha512-M9DGu7rrIltbTEPuBfc8fTOdK1E2CjTIiSqXmVRcof/peDnDC7U7h3XaTx7nbB0gq4HUTUO8BKHrofPC0jPqSw==", + "license": "GPL-2.0-or-later", + "dependencies": { + "@easepick/amp-plugin": "^1.1.0", + "@easepick/base-plugin": "^1.1.0", + "@easepick/core": "^1.1.0", + "@easepick/datetime": "^1.1.0", + "@easepick/kbd-plugin": "^1.1.0", + "@easepick/lock-plugin": "^1.1.0", + "@easepick/preset-plugin": "^1.1.0", + "@easepick/range-plugin": "^1.1.0", + "@easepick/time-plugin": "^1.1.0" + } + }, + "node_modules/@easepick/core": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@easepick/core/-/core-1.2.1.tgz", + "integrity": "sha512-V/blEia/ykAq+0mnQ9djOU5wvMZ+iffL5iuQrKLObpMOw38kL/qo4inH4pCbB3wm7sDjrJTuDKf+6+FrgdFGsw==", + "license": "GPL-2.0-or-later", + "dependencies": { + "@easepick/datetime": "^1.1.0" + } + }, + "node_modules/@easepick/datetime": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@easepick/datetime/-/datetime-1.2.1.tgz", + "integrity": "sha512-KIUvWo/kEipwBqPTazjfUf6R7dKb2ztPizPoB/0ZMYz3HrWJptsLSZQma3R1nM/zkaexnk/e4L4nX+vDjwBtYA==", + "license": "GPL-2.0-or-later" + }, + "node_modules/@easepick/kbd-plugin": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@easepick/kbd-plugin/-/kbd-plugin-1.2.1.tgz", + "integrity": "sha512-t/bEtKuvAbo9b9iw4J5h5DsGYEL4Wm2sLA2VzR2rvmMfJuo1extktgzw2eCy+w6Q/s4ObdKzhXLnjMvFeiJ8Xg==", + "license": "GPL-2.0-or-later", + "dependencies": { + "@easepick/base-plugin": "^1.1.0" + } + }, + "node_modules/@easepick/lock-plugin": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@easepick/lock-plugin/-/lock-plugin-1.2.1.tgz", + "integrity": "sha512-6sJCdliMpnQtzL9dwznS9vYaQUy66VRKPZ+jFdVR1ohiNUVM6C7dSGdG3dPntVTywTy2Z9uU+yJOeWcVFDT61A==", + "license": "GPL-2.0-or-later", + "dependencies": { + "@easepick/base-plugin": "^1.1.0" + } + }, + "node_modules/@easepick/preset-plugin": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@easepick/preset-plugin/-/preset-plugin-1.2.1.tgz", + "integrity": "sha512-VAnjyWpf39kXTR6DYbpCJIBeBhbOgRoNTqntpSb5uF9O398KuHUpIM4Ep1id3fTIlfnRrKxzp54rAFwvc48eCA==", + "license": "GPL-2.0-or-later", + "dependencies": { + "@easepick/base-plugin": "^1.1.0", + "@easepick/range-plugin": "^1.1.0" + } + }, + "node_modules/@easepick/range-plugin": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@easepick/range-plugin/-/range-plugin-1.2.1.tgz", + "integrity": "sha512-yEHLUq32Kj0exLz4txxchALQVJUbwyXvnovfN7yxTrCJLpi6uMmPXcW4lyYig2P9+xM9JqF6JsNqOsi0+5GlHQ==", + "license": "GPL-2.0-or-later", + "dependencies": { + "@easepick/base-plugin": "^1.1.0" + } + }, + "node_modules/@easepick/time-plugin": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@easepick/time-plugin/-/time-plugin-1.2.1.tgz", + "integrity": "sha512-mjynAAppLxlqiDSdHdkBEqi4A67CH17FqO3UH2n6mfAIKPZLQA7R8Y6jEkp+Fpl5tj0/HFqdrk82ceiYYnLFYw==", + "license": "GPL-2.0-or-later", + "dependencies": { + "@easepick/base-plugin": "^1.1.0" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", diff --git a/assets/package.json b/assets/package.json index cfb37f9..8822035 100644 --- a/assets/package.json +++ b/assets/package.json @@ -13,6 +13,7 @@ "test": "standard" }, "dependencies": { + "@easepick/bundle": "^1.2.1", "@fortawesome/fontawesome-free": "^6.7.2", "chart.js": "^4.4.7", "chartjs-adapter-date-fns": "^3.0.0", diff --git a/assets/tailwind.config.js b/assets/tailwind.config.js index 520bf05..4e91578 100644 --- a/assets/tailwind.config.js +++ b/assets/tailwind.config.js @@ -19,6 +19,8 @@ module.exports = { }, extend: { spacing: { + 30: '7.5rem', + 31: '7.75rem', 128: '32rem', 192: '48rem', 256: '64rem' diff --git a/lib/cannery/activity_log.ex b/lib/cannery/activity_log.ex index 59d8190..8bc9d06 100644 --- a/lib/cannery/activity_log.ex +++ b/lib/cannery/activity_log.ex @@ -9,6 +9,8 @@ defmodule Cannery.ActivityLog do @type list_shot_records_option :: {:search, String.t() | nil} | {:class, Type.class() | :all | nil} + | {:start_date, String.t() | nil} + | {:end_date, String.t() | nil} | {:pack_id, Pack.id() | nil} @type list_shot_records_options :: [list_shot_records_option()] @@ -49,6 +51,8 @@ defmodule Cannery.ActivityLog do |> list_shot_records_search(Keyword.get(opts, :search)) |> list_shot_records_class(Keyword.get(opts, :class)) |> list_shot_records_pack_id(Keyword.get(opts, :pack_id)) + |> list_shot_records_start_date(Keyword.get(opts, :start_date)) + |> list_shot_records_end_date(Keyword.get(opts, :end_date)) |> Repo.all() end @@ -100,6 +104,20 @@ defmodule Cannery.ActivityLog do defp list_shot_records_pack_id(query, _all), do: query + @spec list_shot_records_start_date(Queryable.t(), String.t() | nil) :: Queryable.t() + defp list_shot_records_start_date(query, start_date) when start_date |> is_binary() do + query |> where([sr: sr], sr.date >= ^Date.from_iso8601!(start_date)) + end + + defp list_shot_records_start_date(query, _all), do: query + + @spec list_shot_records_end_date(Queryable.t(), String.t() | nil) :: Queryable.t() + defp list_shot_records_end_date(query, end_date) when end_date |> is_binary() do + query |> where([sr: sr], sr.date <= ^Date.from_iso8601!(end_date)) + end + + defp list_shot_records_end_date(query, _all), do: query + @doc """ Returns a count of shot records. diff --git a/lib/cannery_web/components/core_components.ex b/lib/cannery_web/components/core_components.ex index d221d32..a782a6b 100644 --- a/lib/cannery_web/components/core_components.ex +++ b/lib/cannery_web/components/core_components.ex @@ -141,6 +141,20 @@ defmodule CanneryWeb.CoreComponents do """ def datetime(assigns) + attr :id, :string, required: true + attr :name, :string, required: true + + attr :start_date, :string, + default: Date.utc_today() |> Date.shift(year: -1) |> Date.to_iso8601() + + attr :end_date, :string, default: Date.utc_today() |> Date.to_iso8601() + + @doc """ + Phoenix.Component for a