Skip to content

Commit

Permalink
Merge pull request #230 from Seshat-Global-History-Databank/ec_vars
Browse files Browse the repository at this point in the history
almost done with bringing in the economy variables (Lux Goods)
  • Loading branch information
MajidBenam authored Jan 24, 2025
2 parents d5313cc + 22af2c5 commit dd6202e
Show file tree
Hide file tree
Showing 47 changed files with 4,871 additions and 64 deletions.
18 changes: 18 additions & 0 deletions seshat/apps/accounts/migrations/0015_alter_seshat_expert_role.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 4.0.3 on 2025-01-13 13:19

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('accounts', '0014_alter_seshat_expert_role'),
]

operations = [
migrations.AlterField(
model_name='seshat_expert',
name='role',
field=models.CharField(blank=True, choices=[('Seshat Admin', 'Seshat Admin'), ('Researcher', 'Researcher'), ('Seshat Expert', 'Seshat Expert'), ('Lead Researcher', 'Lead Researcher'), ('Seshat Director', 'Seshat Director'), ('Project Manager', 'Project Manager')], max_length=60, null=True),
),
]
16 changes: 15 additions & 1 deletion seshat/apps/core/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from django.forms.formsets import BaseFormSet


from seshat.apps.core.models import Section, Subsection, Variablehierarchy, Reference, Citation, SeshatComment, SeshatCommentPart, Polity, Capital, Nga, SeshatPrivateCommentPart, SeshatPrivateComment, Religion
from seshat.apps.core.models import Section, Subsection, Variablehierarchy, Reference, Citation, SeshatComment, SeshatCommentPart, Polity, Capital, Nga, SeshatPrivateCommentPart, SeshatPrivateComment, Religion, Prec_met_instance
from django.core.exceptions import NON_FIELD_ERRORS
from crispy_forms.helper import FormHelper
from crispy_forms.layout import Submit
Expand All @@ -32,6 +32,20 @@ class Meta:
widgets = {
'religion_name': forms.TextInput(
attrs={'class': 'form-control mb-3', })}


class PreciousMetalInstanceForm(forms.ModelForm):
class Meta:
model = Prec_met_instance
fields = ['name', 'metal']
widgets = {
'name': forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Enter instance name'}),
'metal': forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Enter metal name'}),
}
labels = {
'name': 'Instance Name',
'metal': 'Metal Name',
}


class ReferenceForm(forms.ModelForm):
Expand Down
Loading

0 comments on commit dd6202e

Please sign in to comment.