summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archaeological_finds/forms.py25
-rw-r--r--archaeological_finds/ishtar_menu.py3
-rw-r--r--archaeological_finds/urls.py30
-rw-r--r--archaeological_finds/views.py134
-rw-r--r--archaeological_finds/wizards.py3
-rw-r--r--archaeological_operations/forms.py4
-rw-r--r--archaeological_warehouse/ishtar_menu.py12
-rw-r--r--example_project/urls.py3
-rw-r--r--ishtar_common/menus.py3
9 files changed, 118 insertions, 99 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 21593a450..9c682b25a 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -23,27 +23,26 @@ Finds forms definitions
import datetime
from django import forms
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.conf import settings
from django.core import validators
from django.core.exceptions import ObjectDoesNotExist
-from django.utils.safestring import mark_safe
from django.db.models import Max
+from django.shortcuts import render_to_response
+from django.template import RequestContext
from django.utils.translation import ugettext_lazy as _
-from ishtar import settings
-
-from ishtar_common.models import Person, valid_id
+from ishtar_common.models import Person, valid_id, valid_ids
from archaeological_operations.models import Period, OperationType
from archaeological_context_records.models import DatingType, DatingQuality
from archaeological_warehouse.models import Warehouse, ContainerType, Container
import models
-import widgets
-from forms import FinalForm, FormSet,\
- FloatField, formset_factory, get_now, get_form_selection, reverse_lazy
-from forms_common import get_town_field, get_warehouse_field, SourceForm, \
- SourceSelect, SourceDeletionForm, AuthorFormset
-from forms_context_records import RecordFormSelection
+
+from ishtar_common import widgets
+from ishtar_common.forms import FinalForm, FormSet, FloatField, \
+ formset_factory, get_now, get_form_selection, reverse_lazy
+from ishtar_common.forms_common import get_town_field, get_warehouse_field, \
+ SourceForm, SourceSelect, SourceDeletionForm, AuthorFormset
+from archaeological_context_records.forms import RecordFormSelection
class FindForm(forms.Form):
form_label = _("Find")
@@ -260,6 +259,7 @@ FindSourceFormSelection = get_form_selection(
_(u"You should select a document."))
+"""
####################################
# Source management for treatments #
####################################
@@ -282,6 +282,7 @@ class TreatmentSourceSelect(SourceSelect):
self.fields['operation__operation_type'].help_text = \
OperationType.get_help()
+"""
"""
OperationSourceFormSelection = get_form_selection(
diff --git a/archaeological_finds/ishtar_menu.py b/archaeological_finds/ishtar_menu.py
index 55a498184..ad0809507 100644
--- a/archaeological_finds/ishtar_menu.py
+++ b/archaeological_finds/ishtar_menu.py
@@ -38,9 +38,6 @@ MENU_SECTIONS = [
model=models.Find,
access_controls=['change_item',
'change_own_item']),
- MenuItem('warehouse_packaging', _(u"Packaging"),
- model=models.Treatment,
- access_controls=['add_treatment', 'add_own_treatment']),
#MenuItem('treatment_creation', _(u"Add a treatment"),
# model=models.Treatment,
# access_controls=['add_treatment',
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index e4a7d748f..3d45eb106 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -23,21 +23,21 @@ import views
# forms
urlpatterns = patterns('',
- url(r'item_search/(?P<step>.+)?$',
- views.item_search_wizard, name='item_search'),
- url(r'item_creation/(?P<step>.+)?$',
- views.item_creation_wizard, name='item_creation'),
- url(r'item_modification/(?P<step>.+)?$',
- views.item_modification_wizard, name='item_modification'),
- url(r'item_source_creation/(?P<step>.+)?$',
- views.item_source_creation_wizard,
- name='item_source_creation'),
- url(r'item_source_modification/(?P<step>.+)?$',
- views.item_source_modification_wizard,
- name='item_source_modification'),
- url(r'item_source_deletion/(?P<step>.+)?$',
- views.item_source_deletion_wizard,
- name='item_source_deletion'),
+ url(r'find_search/(?P<step>.+)?$',
+ views.find_search_wizard, name='find_search'),
+ url(r'find_creation/(?P<step>.+)?$',
+ views.find_creation_wizard, name='find_creation'),
+ url(r'find_modification/(?P<step>.+)?$',
+ views.find_modification_wizard, name='find_modification'),
+ url(r'find_source_creation/(?P<step>.+)?$',
+ views.find_source_creation_wizard,
+ name='find_source_creation'),
+ url(r'find_source_modification/(?P<step>.+)?$',
+ views.find_source_modification_wizard,
+ name='find_source_modification'),
+ url(r'find_source_deletion/(?P<step>.+)?$',
+ views.find_source_deletion_wizard,
+ name='find_source_deletion'),
)
urlpatterns += patterns('archaeological_finds.views',
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index 5f2e6cb4a..b52e86659 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -25,45 +25,48 @@ from wizards import *
from forms import *
import models
-get_find = get_item(models.Find,
- 'get_find', 'find',
- bool_fields = ['base_finds__is_isolated'],
- base_request={'downstream_treatment__isnull':True},
- extra_request_keys={
-'base_finds__context_record__parcel__town':
- 'base_finds__context_record__parcel__town',
-'base_finds__context_record__operation__year':
- 'base_finds__context_record__operation__year__contains',
-'base_finds__context_record__operation__code_patriarche':
- 'base_finds__context_record__operation__code_patriarche',
-'dating__period':'dating__period__pk',
-'base_finds__find__description':'base_finds__find__description__icontains',
-'base_finds__is_isolated':'base_finds__is_isolated'})
-get_findsource = get_item(models.FindSource,
- 'get_findsource', 'findsource',
- extra_request_keys={
-'find__context_record__operation__year':'find__context_record__operation__year',
-'find__dating__period':'find__dating__period__pk',
-'find__description':'find__description__icontains',
- })
+get_find = get_item(models.Find, 'get_find', 'find',
+ bool_fields = ['base_finds__is_isolated'],
+ base_request={'downstream_treatment__isnull':True},
+ extra_request_keys={
+ 'base_finds__context_record__parcel__town':
+ 'base_finds__context_record__parcel__town',
+ 'base_finds__context_record__operation__year':
+ 'base_finds__context_record__operation__year__contains',
+ 'base_finds__context_record__operation__code_patriarche':
+ 'base_finds__context_record__operation__code_patriarche',
+ 'dating__period':'dating__period__pk',
+ 'base_finds__find__description':
+ 'base_finds__find__description__icontains',
+ 'base_finds__is_isolated':'base_finds__is_isolated'})
+get_findsource = get_item(models.FindSource, 'get_findsource', 'findsource',
+ extra_request_keys={
+ 'find__context_record__operation__year':
+ 'find__context_record__operation__year',
+ 'find__dating__period':'find__dating__period__pk',
+ 'find__description':'find__description__icontains',
+})
find_creation_wizard = FindWizard.as_view([
('selecrecord-find_creation', RecordFormSelection),
('find-find_creation', FindForm),
('dating-find_creation', DateForm),
('final-find_creation', FinalForm)],
- url_name='find_creation',)
+ label=_(u"New find"),
+ url_name='find_creation',)
find_search_wizard = SearchWizard.as_view([
- ('general-find_search', FindFormSelection)],
- url_name='find_search',)
+ ('general-find_search', FindFormSelection)],
+ label=_(u"Find search"),
+ url_name='find_search',)
find_modification_wizard = FindModificationWizard.as_view([
('selec-find_modification', FindFormSelection),
('find-find_modification', FindForm),
('dating-find_modification', DateForm),
('final-find_modification', FinalForm)],
- url_name='find_modification',)
+ label=_(u"Find modification"),
+ url_name='find_modification',)
treatment_creation_wizard = TreatmentWizard.as_view([
('basetreatment-treatment_creation', BaseTreatmentForm),
@@ -73,49 +76,56 @@ treatment_creation_wizard = TreatmentWizard.as_view([
('resultfind-treatment_creation', ResultFindForm),
('resultfinds-treatment_creation', ResultFindFormSet),
('final-treatment_creation', FinalForm)],
- condition_dict={
-'selecfind-treatment_creation':
- check_treatment('basetreatment-treatment_creation', 'treatment_type',
- not_type_list=['physical_grouping', 'packaging']),
-'multiselecfinds-treatment_creation':
- check_treatment('basetreatment-treatment_creation', 'treatment_type',
- ['physical_grouping', 'packaging']),
-'resultfinds-treatment_creation':
- check_treatment('basetreatment-treatment_creation', 'treatment_type',
- ['split']),
-'resultfind-treatment_creation':
- check_treatment('basetreatment-treatment_creation', 'treatment_type',
- not_type_list=['split']),
-'container-treatment_creation':
- check_treatment('basetreatment-treatment_creation', 'treatment_type',
- ['packaging']),
- },
- url_name='treatment_creation',)
+ condition_dict={
+ 'selecfind-treatment_creation':
+ check_treatment('basetreatment-treatment_creation',
+ 'treatment_type', not_type_list=['physical_grouping',
+ 'packaging']),
+ 'multiselecfinds-treatment_creation':
+ check_treatment('basetreatment-treatment_creation',
+ 'treatment_type', ['physical_grouping',
+ 'packaging']),
+ 'resultfinds-treatment_creation':
+ check_treatment('basetreatment-treatment_creation',
+ 'treatment_type', ['split']),
+ 'resultfind-treatment_creation':
+ check_treatment('basetreatment-treatment_creation',
+ 'treatment_type', not_type_list=['split']),
+ 'container-treatment_creation':
+ check_treatment('basetreatment-treatment_creation',
+ 'treatment_type', ['packaging']),
+ },
+ label=_(u"New treatment"),
+ url_name='treatment_creation',)
find_source_creation_wizard = FindSourceWizard.as_view([
- ('selec-find_source_creation', SourceFindFormSelection),
- ('source-find_source_creation', SourceForm),
- ('authors-find_source_creation', AuthorFormset),
- ('final-find_source_creation', FinalForm)],
- url_name='find_source_creation',)
+ ('selec-find_source_creation', SourceFindFormSelection),
+ ('source-find_source_creation', SourceForm),
+ ('authors-find_source_creation', AuthorFormset),
+ ('final-find_source_creation', FinalForm)],
+ label=_(u"Find: new source"),
+ url_name='find_source_creation',)
find_source_modification_wizard = FindSourceWizard.as_view([
- ('selec-find_source_modification', FindSourceFormSelection),
- ('source-find_source_modification', SourceForm),
- ('authors-find_source_modification', AuthorFormset),
- ('final-find_source_modification', FinalForm)],
- url_name='find_source_modification',)
+ ('selec-find_source_modification', FindSourceFormSelection),
+ ('source-find_source_modification', SourceForm),
+ ('authors-find_source_modification', AuthorFormset),
+ ('final-find_source_modification', FinalForm)],
+ label=_(u"Find: source modification"),
+ url_name='find_source_modification',)
find_source_deletion_wizard = FindSourceDeletionWizard.as_view([
- ('selec-find_source_deletion', FindSourceFormSelection),
- ('final-find_source_deletion', SourceDeletionForm)],
- url_name='find_source_deletion',)
+ ('selec-find_source_deletion', FindSourceFormSelection),
+ ('final-find_source_deletion', SourceDeletionForm)],
+ label=_(u"Find: source deletion"),
+ url_name='find_source_deletion',)
+"""
treatment_source_creation_wizard = TreatmentSourceWizard.as_view([
- ('selec-treatment_source_creation', SourceTreatmentFormSelection),
- ('source-treatment_source_creation', SourceForm),
- ('authors-treatment_source_creation', AuthorFormset),
- ('final-treatment_source_creation', FinalForm)],
- url_name='treatment_source_creation',)
-
+ ('selec-treatment_source_creation', SourceTreatmentFormSelection),
+ ('source-treatment_source_creation', SourceForm),
+ ('authors-treatment_source_creation', AuthorFormset),
+ ('final-treatment_source_creation', FinalForm)],
+ url_name='treatment_source_creation',)
+"""
diff --git a/archaeological_finds/wizards.py b/archaeological_finds/wizards.py
index 4d2a54f73..9effc3770 100644
--- a/archaeological_finds/wizards.py
+++ b/archaeological_finds/wizards.py
@@ -21,6 +21,7 @@ from django.conf import settings
from django.core.exceptions import ObjectDoesNotExist
from django.shortcuts import render_to_response
from django.template import RequestContext
+from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from ishtar_common.wizards import Wizard, DeletionWizard, SourceWizard
@@ -89,6 +90,6 @@ class FindSourceDeletionWizard(DeletionWizard):
fields = ['item', 'title', 'source_type', 'authors',]
class TreatmentSourceWizard(SourceWizard):
- model = models.TreamentSource
+ model = models.TreatmentSource
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index e0eefbe5d..f5f0fea99 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -24,12 +24,12 @@ import datetime
from django import forms
from django.conf import settings
-from django.shortcuts import render_to_response
-from django.template import RequestContext
from django.core import validators
from django.core.exceptions import ObjectDoesNotExist
from django.db.models import Max
from django.forms.formsets import DELETION_FIELD_NAME
+from django.shortcuts import render_to_response
+from django.template import RequestContext
from django.utils.translation import ugettext_lazy as _
from ishtar_common.models import valid_id, PersonType, Person, Town
diff --git a/archaeological_warehouse/ishtar_menu.py b/archaeological_warehouse/ishtar_menu.py
index 1a9d57aaa..7cb287d63 100644
--- a/archaeological_warehouse/ishtar_menu.py
+++ b/archaeological_warehouse/ishtar_menu.py
@@ -24,7 +24,17 @@ from ishtar_common.menu_base import SectionItem, MenuItem
from archaeological_finds.models import Treatment
import models
+
MENU_SECTIONS = [
+ (60, SectionItem('find_management', _(u"Find"),
+ childs=[
+ MenuItem('warehouse_packaging', _(u"Packaging"),
+ model=Treatment,
+ access_controls=['add_treatment', 'add_own_treatment']),
+ ])
+ ),
+]
+"""
(60, SectionItem('warehouse', _(u"Warehouse"),
childs=[
MenuItem('warehouse_inventory', _(u"Inventory"),
@@ -37,4 +47,4 @@ MENU_SECTIONS = [
model=Treatment,
access_controls=['add_treatment', 'add_own_treatment']),
]))
-]
+"""
diff --git a/example_project/urls.py b/example_project/urls.py
index df8d6ae0a..f39243cdb 100644
--- a/example_project/urls.py
+++ b/example_project/urls.py
@@ -16,7 +16,8 @@ APP_LIST = ['archaeological_files', 'archaeological_operations',
'archaeological_context_records', 'archaeological_warehouse',
'archaeological_finds']
APP_LIST = ['archaeological_files', 'archaeological_operations',
- 'archaeological_context_records']
+ 'archaeological_context_records',
+ 'archaeological_finds']
for app in APP_LIST:
if app in settings.INSTALLED_APPS:
urlpatterns += patterns('',
diff --git a/ishtar_common/menus.py b/ishtar_common/menus.py
index 7804d73e4..4802a369d 100644
--- a/ishtar_common/menus.py
+++ b/ishtar_common/menus.py
@@ -45,8 +45,7 @@ for section_item in __section_items:
__keys.append(section_item.idx)
_section_items.append(section_item)
continue
- _section_items[_section_items.index(section_item.idx)].childs.append(
- section_item.childs)
+ _section_items[__keys.index(section_item.idx)].childs += section_item.childs
"""
SectionItem('dashboard', _(u"Dashboard"),
childs=[
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 18:48:02 +0000