Skip to content

Commit

Permalink
Merge branch 'release/0.3.15' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikvw
erikvw committed Nov 26, 2024
2 parents aac971f + 373e5f7 commit 792c84f
Show file tree
Hide file tree
Showing 3 changed files with 248 additions and 2 deletions.
248 changes: 248 additions & 0 deletions edc_pharmacy/migrations/0053_alter_location_managers_alter_historicalstock_lot_and_more.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
# Generated by Django 5.1.2 on 2024-11-26 14:21

import _socket
import django.core.validators
import django.db.models.deletion
import django_audit_fields.fields.hostname_modification_field
import django_audit_fields.fields.userfield
import django_audit_fields.models.audit_model_mixin
import django_revision.revision_field
import edc_pharmacy.models.stock.location
import simple_history.models
import uuid
from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("edc_pharmacy", "0052_formulation_imp_formulation_imp_description_and_more"),
("sites", "0002_alter_domain_unique"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.AlterModelManagers(
name="location",
managers=[
("objects", edc_pharmacy.models.stock.location.Manager()),
],
),
migrations.AlterField(
model_name="historicalstock",
name="lot",
field=models.ForeignKey(
blank=True,
db_constraint=False,
null=True,
on_delete=django.db.models.deletion.DO_NOTHING,
related_name="+",
to="edc_pharmacy.lot",
verbose_name="Batch",
),
),
migrations.AlterField(
model_name="stock",
name="lot",
field=models.ForeignKey(
null=True,
on_delete=django.db.models.deletion.PROTECT,
to="edc_pharmacy.lot",
verbose_name="Batch",
),
),
migrations.CreateModel(
name="HistoricalLocation",
fields=[
(
"revision",
django_revision.revision_field.RevisionField(
blank=True,
editable=False,
help_text="System field. Git repository tag:branch:commit.",
max_length=75,
null=True,
verbose_name="Revision",
),
),
(
"created",
models.DateTimeField(
blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
),
),
(
"modified",
models.DateTimeField(
blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
),
),
(
"user_created",
django_audit_fields.fields.userfield.UserField(
blank=True,
help_text="Updated by admin.save_model",
max_length=50,
verbose_name="user created",
),
),
(
"user_modified",
django_audit_fields.fields.userfield.UserField(
blank=True,
help_text="Updated by admin.save_model",
max_length=50,
verbose_name="user modified",
),
),
(
"hostname_created",
models.CharField(
blank=True,
default=_socket.gethostname,
help_text="System field. (modified on create only)",
max_length=60,
verbose_name="Hostname created",
),
),
(
"hostname_modified",
django_audit_fields.fields.hostname_modification_field.HostnameModificationField(
blank=True,
help_text="System field. (modified on every save)",
max_length=50,
verbose_name="Hostname modified",
),
),
(
"device_created",
models.CharField(blank=True, max_length=10, verbose_name="Device created"),
),
(
"device_modified",
models.CharField(
blank=True, max_length=10, verbose_name="Device modified"
),
),
(
"locale_created",
models.CharField(
blank=True,
help_text="Auto-updated by Modeladmin",
max_length=10,
null=True,
verbose_name="Locale created",
),
),
(
"locale_modified",
models.CharField(
blank=True,
help_text="Auto-updated by Modeladmin",
max_length=10,
null=True,
verbose_name="Locale modified",
),
),
(
"name",
models.CharField(
db_index=True,
help_text="This is the stored value, required",
max_length=250,
verbose_name="Stored value",
),
),
(
"plural_name",
models.CharField(max_length=250, null=True, verbose_name="Plural name"),
),
(
"display_index",
models.IntegerField(
default=0,
help_text="Index to control display order if not alphabetical, not required",
verbose_name="display index",
),
),
(
"field_name",
models.CharField(
blank=True,
editable=False,
help_text="Not required",
max_length=25,
null=True,
),
),
("extra_value", models.CharField(max_length=250, null=True)),
("version", models.CharField(default="1.0", editable=False, max_length=35)),
("id", models.IntegerField(blank=True, db_index=True)),
(
"display_name",
models.CharField(
blank=True,
db_index=True,
help_text="(suggest 40 characters max.)",
max_length=250,
null=True,
verbose_name="Name",
),
),
("contact_name", models.CharField(blank=True, max_length=150, null=True)),
(
"contact_tel",
models.CharField(
blank=True,
max_length=150,
null=True,
validators=[django.core.validators.RegexValidator("[0-9]{1,15}")],
),
),
("contact_email", models.EmailField(blank=True, max_length=150, null=True)),
(
"history_id",
models.UUIDField(
default=uuid.uuid4, editable=False, primary_key=True, serialize=False
),
),
("history_date", models.DateTimeField(db_index=True)),
("history_change_reason", models.CharField(max_length=100, null=True)),
(
"history_type",
models.CharField(
choices=[("+", "Created"), ("~", "Changed"), ("-", "Deleted")],
max_length=1,
),
),
(
"history_user",
models.ForeignKey(
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="+",
to=settings.AUTH_USER_MODEL,
),
),
(
"site",
models.ForeignKey(
blank=True,
db_constraint=False,
null=True,
on_delete=django.db.models.deletion.DO_NOTHING,
related_name="+",
to="sites.site",
),
),
],
options={
"verbose_name": "historical Location",
"verbose_name_plural": "historical Locations",
"ordering": ("-history_date", "-history_id"),
"get_latest_by": ("history_date", "history_id"),
},
bases=(simple_history.models.HistoricalChanges, models.Model),
),
]
1 change: 0 additions & 1 deletion edc_pharmacy/templates/edc_pharmacy/stock/stock_request_product_column.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
{{ formulation }}
<BR>{{ containers_per_subject }} x {{ container }}

1 change: 0 additions & 1 deletion edc_pharmacy/templates/edc_pharmacy/stock/subject_list_display.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<a title="search by subject_identifier" href="{{ changelist_url }}?q={{ subject_identifier }}">{{ subject_identifier }}</a>
<BR>{{ visit_code_and_seq }}
<BR>{{ appt_date }}

0 comments on commit 792c84f

Please sign in to comment.