mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-07-27 11:05:22 +02:00
Compare commits
5 Commits
update_inv
...
aa344b6fdd
Author | SHA1 | Date | |
---|---|---|---|
aa344b6fdd | |||
84e9fea15f | |||
b7a660ee40 | |||
b9ebb1718a | |||
93aed87265 |
@ -201,7 +201,8 @@ class Entry(models.Model):
|
|||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
qs = Entry.objects.filter(~Q(pk=self.pk), activity=self.activity, note=self.note, guest=self.guest)
|
qs = Entry.objects.filter(~Q(pk=self.pk), activity=self.activity, note=self.note, guest=self.guest)
|
||||||
if qs.exists():
|
if qs.exists():
|
||||||
raise ValidationError(_("Already entered on ") + _("{:%Y-%m-%d %H:%M:%S}").format(qs.get().time, ))
|
raise ValidationError(_("Already entered on ")
|
||||||
|
+ _("{:%Y-%m-%d %H:%M:%S}").format(timezone.localtime(qs.get().time), ))
|
||||||
|
|
||||||
if self.guest:
|
if self.guest:
|
||||||
self.note = self.guest.inviter
|
self.note = self.guest.inviter
|
||||||
|
@ -55,7 +55,7 @@ class GuestTable(tables.Table):
|
|||||||
|
|
||||||
def render_entry(self, record):
|
def render_entry(self, record):
|
||||||
if record.has_entry:
|
if record.has_entry:
|
||||||
return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(record.entry.time, )))
|
return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(timezone.localtime(record.entry.time))))
|
||||||
return mark_safe('<button id="{id}" class="btn btn-danger btn-sm" onclick="remove_guest(this.id)"> '
|
return mark_safe('<button id="{id}" class="btn btn-danger btn-sm" onclick="remove_guest(this.id)"> '
|
||||||
'{delete_trans}</button>'.format(id=record.id, delete_trans=_("remove").capitalize()))
|
'{delete_trans}</button>'.format(id=record.id, delete_trans=_("remove").capitalize()))
|
||||||
|
|
||||||
|
@ -20,12 +20,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<!-- MODAL TO CROP THE IMAGE -->
|
<!-- MODAL TO CROP THE IMAGE -->
|
||||||
<div class="modal fade" id="modalCrop">
|
<div class="modal fade" id="modalCrop" data-backdrop="static">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-body">
|
<div class="modal-body-wrapper" style="width: 500px; height: 500px; padding: 16px;">
|
||||||
<img src="" id="modal-image" style="max-width: 100%;">
|
<div class="modal-body" style="width: 100%; height: 100%; padding: 0">
|
||||||
</div>
|
<img src="" id="modal-image" style="display: block; max-width: 100%;">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<div class="btn-group pull-left" role="group">
|
<div class="btn-group pull-left" role="group">
|
||||||
<button type="button" class="btn btn-default" id="js-zoom-in">
|
<button type="button" class="btn btn-default" id="js-zoom-in">
|
||||||
|
@ -1,18 +0,0 @@
|
|||||||
# Generated by Django 4.2.20 on 2025-04-14 20:21
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('treasury', '0009_alter_sogecredit_transactions'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='invoice',
|
|
||||||
name='bde',
|
|
||||||
field=models.CharField(choices=[('Diolistos', 'Diol[list]os'), ('RavePartlist', 'RavePart[list]'), ('SecretStorlist', 'SecretStor[list]'), ('TotalistSpies', 'Tota[list]Spies'), ('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='Diolistos', max_length=32, verbose_name='BDE'),
|
|
||||||
),
|
|
||||||
]
|
|
@ -27,9 +27,8 @@ class Invoice(models.Model):
|
|||||||
|
|
||||||
bde = models.CharField(
|
bde = models.CharField(
|
||||||
max_length=32,
|
max_length=32,
|
||||||
default='Diolistos',
|
default='RavePartlist',
|
||||||
choices=(
|
choices=(
|
||||||
('Diolistos', 'Diol[list]os'),
|
|
||||||
('RavePartlist', 'RavePart[list]'),
|
('RavePartlist', 'RavePart[list]'),
|
||||||
('SecretStorlist', 'SecretStor[list]'),
|
('SecretStorlist', 'SecretStor[list]'),
|
||||||
('TotalistSpies', 'Tota[list]Spies'),
|
('TotalistSpies', 'Tota[list]Spies'),
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 2.8 MiB |
Binary file not shown.
Before Width: | Height: | Size: 284 KiB |
Reference in New Issue
Block a user