CMS/cmsmanage
2
0
Fork 0
Code Issues 8 Pull Requests 1 Actions Projects 1 Releases Activity

Compare commits

base: CMS:56f49f8784bc49d590579d033bbe9d2d9fb30e76
Branches Tags
CMS:main
CMS:renovate/postgres-17.x
..
compare: CMS:0e865512baaed27eacc69bd5944148d2699ee644
Branches Tags
CMS:main
CMS:renovate/postgres-17.x

No commits in common. "56f49f8784bc49d590579d033bbe9d2d9fb30e76" and "0e865512baaed27eacc69bd5944148d2699ee644" have entirely different histories.
56f49f8784 ... 0e865512ba

7 changed files with 72 additions and 114 deletions
Show Stats Expand all files Collapse all files

3
.gitignore vendored
View File

@ -5,9 +5,6 @@ __pycache__/
/media/ /media/
/settings.*.env /settings.*.env
/staticfiles/ /staticfiles/
/.hypothesis/
/.pdm-python
/.coverage
# Logs # Logs
/logs /logs

2
.pre-commit-config.yaml
View File

@ -14,7 +14,7 @@ repos:
- id: djlint-reformat-django - id: djlint-reformat-django
- repo: https://github.com/astral-sh/ruff-pre-commit - repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.4 rev: v0.6.3
hooks: hooks:
- id: ruff - id: ruff
- id: ruff-format - id: ruff-format

52
membershipworks/tables.py
View File

@ -21,23 +21,6 @@ class DurationColumn(tables.Column):
return value.total_seconds() / 60 / 60 return value.total_seconds() / 60 / 60
class MoneyColumn(tables.columns.Column):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.attrs["cell"] = {"class": "text-end", **self.attrs.get("cell", {})}
def render(self, value) -> str:
return f"{super().render(value):.2f}"
def value(self, **kwargs):
return kwargs["value"]
class CurrencySymbolMoneyColumn(MoneyColumn):
def render(self, value) -> str:
return f"${super().render(value)}"
class EventTable(tables.Table): class EventTable(tables.Table):
title = tables.TemplateColumn( title = tables.TemplateColumn(
template_code=( template_code=(
@ -53,9 +36,9 @@ class EventTable(tables.Table):
duration = DurationColumn() duration = DurationColumn()
person_hours = DurationColumn() person_hours = DurationColumn()
meetings = tables.Column() meetings = tables.Column()
gross_revenue = MoneyColumn() gross_revenue = tables.Column()
total_due_to_instructor = MoneyColumn() total_due_to_instructor = tables.Column()
net_revenue = MoneyColumn() net_revenue = tables.Column()
invoice__date_submitted = tables.DateColumn(verbose_name="Invoice Submitted") invoice__date_submitted = tables.DateColumn(verbose_name="Invoice Submitted")
invoice__date_paid = tables.DateColumn(verbose_name="Invoice Paid") invoice__date_paid = tables.DateColumn(verbose_name="Invoice Paid")
@ -120,9 +103,9 @@ class EventSummaryTable(tables.Table):
meetings__sum = tables.Column("Meetings") meetings__sum = tables.Column("Meetings")
duration__sum = DurationColumn("Class Hours") duration__sum = DurationColumn("Class Hours")
person_hours__sum = DurationColumn("Person Hours") person_hours__sum = DurationColumn("Person Hours")
gross_revenue__sum = MoneyColumn("Gross Revenue") gross_revenue__sum = tables.Column("Gross Revenue")
total_due_to_instructor__sum = MoneyColumn("Total Due to Instructor") total_due_to_instructor__sum = tables.Column("Total Due to Instructor")
net_revenue__sum = MoneyColumn("Net Revenue") net_revenue__sum = tables.Column("Net Revenue")
class UserEventTable(EventTable): class UserEventTable(EventTable):
@ -153,7 +136,12 @@ class CurrentAndUpcomingEventTable(EventTable):
sequence = ("title", "start", "next_meeting") sequence = ("title", "start", "next_meeting")
class MoneyFooterColumn(MoneyColumn): class InvoiceMoneyColumn(tables.columns.Column):
def render(self, value):
return f"${super().render(value):.2f}"
class InvoiceMoneyFooterColumn(InvoiceMoneyColumn):
def render_footer(self, bound_column, table): def render_footer(self, bound_column, table):
value = getattr(table.event, bound_column.accessor) value = getattr(table.event, bound_column.accessor)
if value is not None: if value is not None:
@ -176,23 +164,23 @@ class InvoiceTable(tables.Table):
) )
label = tables.Column("Ticket Type", footer="Subtotals") label = tables.Column("Ticket Type", footer="Subtotals")
list_price = CurrencySymbolMoneyColumn("Ticket Price") list_price = InvoiceMoneyColumn("Ticket Price")
actual_price = CurrencySymbolMoneyColumn(_math_header("Actual Price", "P")) actual_price = InvoiceMoneyColumn(_math_header("Actual Price", "P"))
quantity = tables.Column( quantity = tables.Column(
_math_header("Quantity", "Q"), _math_header("Quantity", "Q"),
footer=lambda table: table.event.quantity, footer=lambda table: table.event.quantity,
) )
amount = CurrencySymbolMoneyColumn(_math_header("Amount", "A=P*Q")) amount = InvoiceMoneyFooterColumn(_math_header("Amount", "A=P*Q"))
materials = CurrencySymbolMoneyColumn( materials = InvoiceMoneyFooterColumn(
_math_header("CMS Collected Materials Fee", "M=m*Q") _math_header("CMS Collected Materials Fee", "M=m*Q")
) )
amount_without_materials = CurrencySymbolMoneyColumn( amount_without_materials = InvoiceMoneyFooterColumn(
_math_header("Event Revenue Base", "B=A-M") _math_header("Event Revenue Base", "B=A-M")
) )
instructor_revenue = CurrencySymbolMoneyColumn( instructor_revenue = InvoiceMoneyFooterColumn(
_math_header("Instructor Percentage Revenue", "R=B*I"), _math_header("Instructor Percentage Revenue", "R=B*I")
) )
instructor_amount = CurrencySymbolMoneyColumn( instructor_amount = InvoiceMoneyFooterColumn(
_math_header("Amount Due to Instructor", "R+M") _math_header("Amount Due to Instructor", "R+M")
) )

4
package.json
View File

@ -13,9 +13,9 @@
"@types/tabulator-tables": "^6.2.3", "@types/tabulator-tables": "^6.2.3",
"globby": "^14.0.2", "globby": "^14.0.2",
"prettier": "^3.3.3", "prettier": "^3.3.3",
"sass": "^1.78.0", "sass": "^1.77.8",
"typescript": "^5.5.4", "typescript": "^5.5.4",
"vite": "^5.4.3" "vite": "^5.4.2"
}, },
"dependencies": { "dependencies": {
"@popperjs/core": "^2.11.8", "@popperjs/core": "^2.11.8",

64
pdm.lock
View File

@ -5,7 +5,7 @@
groups = ["default", "debug", "dev", "lint", "server", "typing"] groups = ["default", "debug", "dev", "lint", "server", "typing"]
strategy = ["inherit_metadata"] strategy = ["inherit_metadata"]
lock_version = "4.5.0" lock_version = "4.5.0"
content_hash = "sha256:ee03f713c8983dc55cb85aacb388f8df8b4f910a2704d3ecd32e4bd203c2a3dd" content_hash = "sha256:2352a5fdfb84e6efba254f0874182ba0b5ff2522a6d6384d3610c2c18671008f"
[[metadata.targets]] [[metadata.targets]]
requires_python = "==3.11.*" requires_python = "==3.11.*"
@ -267,18 +267,6 @@ files = [
{file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
] ]
[[package]]
name = "coverage"
version = "7.6.1"
requires_python = ">=3.8"
summary = "Code coverage measurement for Python"
groups = ["dev"]
marker = "python_version == \"3.11\""
files = [
{file = "coverage-7.6.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0c0420b573964c760df9e9e86d1a9a622d0d27f417e1a949a8a66dd7bcee7bc6"},
{file = "coverage-7.6.1.tar.gz", hash = "sha256:953510dfb7b12ab69d20135a0662397f077c59b1e6379a768e97c59d852ee51d"},
]
[[package]] [[package]]
name = "cssbeautifier" name = "cssbeautifier"
version = "1.15.1" version = "1.15.1"
@ -560,7 +548,7 @@ files = [
[[package]] [[package]]
name = "django-model-utils" name = "django-model-utils"
version = "5.0.0" version = "4.5.1"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "Django model mixins and utilities" summary = "Django model mixins and utilities"
groups = ["default"] groups = ["default"]
@ -569,8 +557,8 @@ dependencies = [
"Django>=3.2", "Django>=3.2",
] ]
files = [ files = [
{file = "django_model_utils-5.0.0-py3-none-any.whl", hash = "sha256:fec78e6c323d565a221f7c4edc703f4567d7bb1caeafe1acd16a80c5ff82056b"}, {file = "django_model_utils-4.5.1-py3-none-any.whl", hash = "sha256:f1141fc71796242edeffed5ad53a8cc57f00d345eb5a3a63e3f69401cd562ee2"},
{file = "django_model_utils-5.0.0.tar.gz", hash = "sha256:041cdd6230d2fbf6cd943e1969318bce762272077f4ecd333ab2263924b4e5eb"}, {file = "django_model_utils-4.5.1.tar.gz", hash = "sha256:1220f22d9a467d53a1e0f4cda4857df0b2f757edf9a29955c42461988caa648a"},
] ]
[[package]] [[package]]
@ -1030,7 +1018,7 @@ files = [
[[package]] [[package]]
name = "google-api-python-client" name = "google-api-python-client"
version = "2.144.0" version = "2.143.0"
requires_python = ">=3.7" requires_python = ">=3.7"
summary = "Google API Client Library for Python" summary = "Google API Client Library for Python"
groups = ["default", "typing"] groups = ["default", "typing"]
@ -1043,8 +1031,8 @@ dependencies = [
"uritemplate<5,>=3.0.1", "uritemplate<5,>=3.0.1",
] ]
files = [ files = [
{file = "google_api_python_client-2.144.0-py2.py3-none-any.whl", hash = "sha256:f9c333ac4454a012adca90c297f9a22611a8953f3aae5481f90b3a56b9bdd413"}, {file = "google_api_python_client-2.143.0-py2.py3-none-any.whl", hash = "sha256:d5654134522b9b574b82234e96f7e0aeeabcbf33643fbabcd449ef0068e3a476"},
{file = "google_api_python_client-2.144.0.tar.gz", hash = "sha256:fe00851b257157bca600e1692ed8a54762c4a5c7d9eb7f6d4822059424b0d0a9"}, {file = "google_api_python_client-2.143.0.tar.gz", hash = "sha256:6a75441f9078e6e2fcdf4946a153fda1e2cc81b5e9c8d6e8c0750c85c7f8a566"},
] ]
[[package]] [[package]]
@ -1212,7 +1200,7 @@ files = [
[[package]] [[package]]
name = "hypothesis" name = "hypothesis"
version = "6.112.0" version = "6.111.2"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "A library for property-based testing" summary = "A library for property-based testing"
groups = ["dev"] groups = ["dev"]
@ -1223,13 +1211,13 @@ dependencies = [
"sortedcontainers<3.0.0,>=2.1.0", "sortedcontainers<3.0.0,>=2.1.0",
] ]
files = [ files = [
{file = "hypothesis-6.112.0-py3-none-any.whl", hash = "sha256:1e6adbd9534c0d691690b5006904327ea37c851d4e15262a22094aa77879e84d"}, {file = "hypothesis-6.111.2-py3-none-any.whl", hash = "sha256:055e8228958e22178d6077e455fd86a72044d02dac130dbf9c8b31e161b9809c"},
{file = "hypothesis-6.112.0.tar.gz", hash = "sha256:06ea8857e1e711a1a6f24154a3c8c4eab04b041993206aaa267f98b859fd6ef5"}, {file = "hypothesis-6.111.2.tar.gz", hash = "sha256:0496ad28c7240ee9ba89fcc7fb1dc74e89f3e40fbcbbb5f73c0091558dec8e6e"},
] ]
[[package]] [[package]]
name = "hypothesis" name = "hypothesis"
version = "6.112.0" version = "6.111.2"
extras = ["django"] extras = ["django"]
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "A library for property-based testing" summary = "A library for property-based testing"
@ -1237,11 +1225,11 @@ groups = ["dev"]
marker = "python_version == \"3.11\"" marker = "python_version == \"3.11\""
dependencies = [ dependencies = [
"django>=3.2", "django>=3.2",
"hypothesis==6.112.0", "hypothesis==6.111.2",
] ]
files = [ files = [
{file = "hypothesis-6.112.0-py3-none-any.whl", hash = "sha256:1e6adbd9534c0d691690b5006904327ea37c851d4e15262a22094aa77879e84d"}, {file = "hypothesis-6.111.2-py3-none-any.whl", hash = "sha256:055e8228958e22178d6077e455fd86a72044d02dac130dbf9c8b31e161b9809c"},
{file = "hypothesis-6.112.0.tar.gz", hash = "sha256:06ea8857e1e711a1a6f24154a3c8c4eab04b041993206aaa267f98b859fd6ef5"}, {file = "hypothesis-6.111.2.tar.gz", hash = "sha256:0496ad28c7240ee9ba89fcc7fb1dc74e89f3e40fbcbbb5f73c0091558dec8e6e"},
] ]
[[package]] [[package]]
@ -1961,14 +1949,14 @@ files = [
[[package]] [[package]]
name = "ruff" name = "ruff"
version = "0.6.4" version = "0.6.3"
requires_python = ">=3.7" requires_python = ">=3.7"
summary = "An extremely fast Python linter and code formatter, written in Rust." summary = "An extremely fast Python linter and code formatter, written in Rust."
groups = ["lint"] groups = ["lint"]
marker = "python_version == \"3.11\"" marker = "python_version == \"3.11\""
files = [ files = [
{file = "ruff-0.6.4-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b52387d3289ccd227b62102c24714ed75fbba0b16ecc69a923a37e3b5e0aaaa"}, {file = "ruff-0.6.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70452a10eb2d66549de8e75f89ae82462159855e983ddff91bc0bce6511d0470"},
{file = "ruff-0.6.4.tar.gz", hash = "sha256:ac3b5bfbee99973f80aa1b7cbd1c9cbce200883bdd067300c22a6cc1c7fba212"}, {file = "ruff-0.6.3.tar.gz", hash = "sha256:183b99e9edd1ef63be34a3b51fee0a9f4ab95add123dbf89a71f7b1f0c991983"},
] ]
[[package]] [[package]]
@ -1985,14 +1973,14 @@ files = [
[[package]] [[package]]
name = "setuptools" name = "setuptools"
version = "74.1.2" version = "74.1.1"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "Easily download, build, install, upgrade, and uninstall Python packages" summary = "Easily download, build, install, upgrade, and uninstall Python packages"
groups = ["server", "typing"] groups = ["server", "typing"]
marker = "python_version == \"3.11\"" marker = "python_version == \"3.11\""
files = [ files = [
{file = "setuptools-74.1.2-py3-none-any.whl", hash = "sha256:5f4c08aa4d3ebcb57a50c33b1b07e94315d7fc7230f7115e47fc99776c8ce308"}, {file = "setuptools-74.1.1-py3-none-any.whl", hash = "sha256:fc91b5f89e392ef5b77fe143b17e32f65d3024744fba66dc3afe07201684d766"},
{file = "setuptools-74.1.2.tar.gz", hash = "sha256:95b40ed940a1c67eb70fc099094bd6e99c6ee7c23aa2306f4d2697ba7916f9c6"}, {file = "setuptools-74.1.1.tar.gz", hash = "sha256:2353af060c06388be1cecbf5953dcdb1f38362f87a2356c480b6b4d5fcfc8847"},
] ]
[[package]] [[package]]
@ -2279,14 +2267,14 @@ files = [
[[package]] [[package]]
name = "types-python-dateutil" name = "types-python-dateutil"
version = "2.9.0.20240906" version = "2.9.0.20240821"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "Typing stubs for python-dateutil" summary = "Typing stubs for python-dateutil"
groups = ["typing"] groups = ["typing"]
marker = "python_version == \"3.11\"" marker = "python_version == \"3.11\""
files = [ files = [
{file = "types-python-dateutil-2.9.0.20240906.tar.gz", hash = "sha256:9706c3b68284c25adffc47319ecc7947e5bb86b3773f843c73906fd598bc176e"}, {file = "types-python-dateutil-2.9.0.20240821.tar.gz", hash = "sha256:9649d1dcb6fef1046fb18bebe9ea2aa0028b160918518c34589a46045f6ebd98"},
{file = "types_python_dateutil-2.9.0.20240906-py3-none-any.whl", hash = "sha256:27c8cc2d058ccb14946eebcaaa503088f4f6dbc4fb6093d3d456a49aef2753f6"}, {file = "types_python_dateutil-2.9.0.20240821-py3-none-any.whl", hash = "sha256:f5889fcb4e63ed4aaa379b44f93c32593d50b9a94c9a60a0c854d8cc3511cd57"},
] ]
[[package]] [[package]]
@ -2303,7 +2291,7 @@ files = [
[[package]] [[package]]
name = "types-requests" name = "types-requests"
version = "2.32.0.20240907" version = "2.32.0.20240712"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "Typing stubs for requests" summary = "Typing stubs for requests"
groups = ["typing"] groups = ["typing"]
@ -2312,8 +2300,8 @@ dependencies = [
"urllib3>=2", "urllib3>=2",
] ]
files = [ files = [
{file = "types-requests-2.32.0.20240907.tar.gz", hash = "sha256:ff33935f061b5e81ec87997e91050f7b4af4f82027a7a7a9d9aaea04a963fdf8"}, {file = "types-requests-2.32.0.20240712.tar.gz", hash = "sha256:90c079ff05e549f6bf50e02e910210b98b8ff1ebdd18e19c873cd237737c1358"},
{file = "types_requests-2.32.0.20240907-py3-none-any.whl", hash = "sha256:1d1e79faeaf9d42def77f3c304893dea17a97cae98168ac69f3cb465516ee8da"}, {file = "types_requests-2.32.0.20240712-py3-none-any.whl", hash = "sha256:f754283e152c752e46e70942fa2a146b5bc70393522257bb85bd1ef7e019dcc3"},
] ]
[[package]] [[package]]

40
pnpm-lock.yaml
View File

@ -34,14 +34,14 @@ importers:
specifier: ^3.3.3 specifier: ^3.3.3
version: 3.3.3 version: 3.3.3
sass: sass:
specifier: ^1.78.0 specifier: ^1.77.8
version: 1.78.0 version: 1.77.8
typescript: typescript:
specifier: ^5.5.4 specifier: ^5.5.4
version: 5.5.4 version: 5.5.4
vite: vite:
specifier: ^5.4.3 specifier: ^5.4.2
version: 5.4.3(sass@1.78.0) version: 5.4.2(sass@1.77.8)
packages: packages:
@ -395,8 +395,8 @@ packages:
resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
engines: {node: '>=8.6'} engines: {node: '>=8.6'}
postcss@8.4.45: postcss@8.4.44:
resolution: {integrity: sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==} resolution: {integrity: sha512-Aweb9unOEpQ3ezu4Q00DPvvM2ZTUitJdNKeP/+uQgr1IBIqu574IaZoURId7BKtWMREwzKa9OgzPzezWGPWFQw==}
engines: {node: ^10 || ^12 || >=14} engines: {node: ^10 || ^12 || >=14}
prettier@3.3.3: prettier@3.3.3:
@ -423,8 +423,8 @@ packages:
run-parallel@1.2.0: run-parallel@1.2.0:
resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
sass@1.78.0: sass@1.77.8:
resolution: {integrity: sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==} resolution: {integrity: sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==}
engines: {node: '>=14.0.0'} engines: {node: '>=14.0.0'}
hasBin: true hasBin: true
@ -432,8 +432,8 @@ packages:
resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==} resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==}
engines: {node: '>=14.16'} engines: {node: '>=14.16'}
source-map-js@1.2.1: source-map-js@1.2.0:
resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
engines: {node: '>=0.10.0'} engines: {node: '>=0.10.0'}
tabulator-tables@6.2.5: tabulator-tables@6.2.5:
@ -452,8 +452,8 @@ packages:
resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
engines: {node: '>=18'} engines: {node: '>=18'}
vite@5.4.3: vite@5.4.2:
resolution: {integrity: sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==} resolution: {integrity: sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==}
engines: {node: ^18.0.0 || >=20.0.0} engines: {node: ^18.0.0 || >=20.0.0}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
@ -746,11 +746,11 @@ snapshots:
picomatch@2.3.1: {} picomatch@2.3.1: {}
postcss@8.4.45: postcss@8.4.44:
dependencies: dependencies:
nanoid: 3.3.7 nanoid: 3.3.7
picocolors: 1.1.0 picocolors: 1.1.0
source-map-js: 1.2.1 source-map-js: 1.2.0
prettier@3.3.3: {} prettier@3.3.3: {}
@ -788,15 +788,15 @@ snapshots:
dependencies: dependencies:
queue-microtask: 1.2.3 queue-microtask: 1.2.3
sass@1.78.0: sass@1.77.8:
dependencies: dependencies:
chokidar: 3.6.0 chokidar: 3.6.0
immutable: 4.3.7 immutable: 4.3.7
source-map-js: 1.2.1 source-map-js: 1.2.0
slash@5.1.0: {} slash@5.1.0: {}
source-map-js@1.2.1: {} source-map-js@1.2.0: {}
tabulator-tables@6.2.5: {} tabulator-tables@6.2.5: {}
@ -808,11 +808,11 @@ snapshots:
unicorn-magic@0.1.0: {} unicorn-magic@0.1.0: {}
vite@5.4.3(sass@1.78.0): vite@5.4.2(sass@1.77.8):
dependencies: dependencies:
esbuild: 0.21.5 esbuild: 0.21.5
postcss: 8.4.45 postcss: 8.4.44
rollup: 4.21.2 rollup: 4.21.2
optionalDependencies: optionalDependencies:
fsevents: 2.3.3 fsevents: 2.3.3
sass: 1.78.0 sass: 1.77.8

21
pyproject.toml
View File

@ -39,9 +39,9 @@ dependencies = [
"django-configurations[database,email]~=2.5", "django-configurations[database,email]~=2.5",
"django-vite~=3.0", "django-vite~=3.0",
"django-template-partials~=24.4", "django-template-partials~=24.4",
"google-api-python-client~=2.144", "google-api-python-client~=2.143",
"google-auth-oauthlib~=1.2", "google-auth-oauthlib~=1.2",
"django-model-utils~=5.0", "django-model-utils~=4.5",
"psycopg[binary,pool]~=3.2", "psycopg[binary,pool]~=3.2",
"django-simple-history~=3.7", "django-simple-history~=3.7",
"django-postgres-metrics~=0.15", "django-postgres-metrics~=0.15",
@ -132,20 +132,6 @@ plugins = [
django_settings_module = "cmsmanage.settings" django_settings_module = "cmsmanage.settings"
strict_settings = false strict_settings = false
[tool.coverage.run]
source = [
"cmsmanage",
"dashboard",
"doorcontrol",
"membershipworks",
"paperwork",
"rentals",
"reservations",
]
omit = [
"*/migrations/*",
]
[[tool.pdm.source]] [[tool.pdm.source]]
url = "https://pypi.org/simple" url = "https://pypi.org/simple"
verify_ssl = true verify_ssl = true
@ -183,9 +169,8 @@ debug = [
dev = [ dev = [
"django-extensions~=3.2", "django-extensions~=3.2",
"ipython~=8.27", "ipython~=8.27",
"hypothesis[django]~=6.112", "hypothesis[django]~=6.111",
"tblib~=3.0", "tblib~=3.0",
"coverage~=7.6",
] ]
[tool.pdm.scripts] [tool.pdm.scripts]