matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Document upload and metadata input working

Browse Source
This commit is contained in:
Roberto Rosario
2011-02-03 17:17:04 -04:00
parent fc6545f45a
commit 986dc5d805
77 changed files with 2851 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/documents/__init__.py
View File

@@ -0,0 +1,12 @@
from django.utils.translation import ugettext_lazy as _
from common.api import register_links, register_menu
document_list = {'text':_(u'documents'), 'view':'document_list', 'famfam':'page'}
document_create = {'text':_('create document'), 'view':'document_create', 'famfam':'page_add'}
register_menu([
{'text':_('documents'), 'view':'document_list', 'links':[
document_list, document_create
],'famfam':'page','position':4}])

5
apps/documents/admin.py
View File

@@ -1,10 +1,11 @@
from django.contrib import admin
from models import MetadataType, DocumentType, Document, \
DocumentTypeMetadataTypeConnector
DocumentTypeMetadataType, DocumentMetadata
admin.site.register(MetadataType)
admin.site.register(DocumentType)
admin.site.register(Document)
admin.site.register(DocumentTypeMetadataTypeConnector)
admin.site.register(DocumentTypeMetadataType)
admin.site.register(DocumentMetadata)

68
apps/documents/forms.py Normal file
View File

@@ -0,0 +1,68 @@
from django import forms
from django.utils.translation import ugettext_lazy as _
from django.http import HttpResponseRedirect
from django.utils.http import urlencode
from django.core.urlresolvers import reverse
from common.wizard import BoundFormWizard
from common.utils import urlquote
from models import Document, DocumentType, DocumentTypeMetadataType
class DocumentForm(forms.ModelForm):
class Meta:
model = Document
class DocumentTypeSelectForm(forms.Form):
document_type = forms.ModelChoiceField(queryset=DocumentType.objects.all())
class MetadataForm(forms.Form):
def __init__(self, *args, **kwargs):
if 'initial' in kwargs:
self.metadata_type = kwargs['initial'].pop('metadata_type', None)
super(MetadataForm, self).__init__(*args, **kwargs)
self.fields['id'] = forms.CharField(label=_(u'id'), widget=forms.HiddenInput)
self.fields['name'] = forms.CharField(label=_(u'Name'),
required=False, widget=forms.TextInput(attrs={'readonly':'readonly'}))
self.fields['value'] = forms.CharField(label=_(u'Value'))
if hasattr(self, 'metadata_type'):
self.fields['name'].initial=self.metadata_type.name
self.fields['id'].initial=self.metadata_type.id
class DocumentCreateWizard(BoundFormWizard):
def render_template(self, request, form, previous_fields, step, context=None):
context = {'step_title':self.extra_context['step_titles'][step]}
return super(DocumentCreateWizard, self).render_template(request, form, previous_fields, step, context)
def parse_params(self, request, *args, **kwargs):
self.extra_context={'step_titles':[
_(u'step 1 of 2: Document type'),
_(u'step 2 of 2: Document metadata'),
]}
def process_step(self, request, form, step):
if step == 0:
self.document_type = form.cleaned_data['document_type']
initial=[]
for item in DocumentTypeMetadataType.objects.filter(document_type=self.document_type):
initial.append({
'metadata_type':item.metadata_type,
})
self.initial = {1:initial}
if step == 1:
self.urldata = []
for metadata in form.cleaned_data:
self.urldata.append((metadata['id'],metadata['value']))
def get_template(self, step):
return 'generic_wizard.html'
def done(self, request, form_list):
url = reverse('upload_document_with_type', args=[self.document_type.id])
return HttpResponseRedirect('%s?%s' % (url, urlencode(self.urldata)))

80
apps/documents/models.py
View File

@@ -1,5 +1,6 @@
import os
import uuid
import mimetypes
from datetime import datetime
from django.db import models
@@ -13,9 +14,8 @@ def get_filename_from_uuid(instance, filename, directory='documents'):
def populate_file_extension_and_mimetype(instance, filename):
# First populate the file extension and mimetype
instance.file_mimetype, encoding = guess_type(filename) or ""
slug, instance.file_extension = os.path.splitext(filename)
#instance.slug, instance.extension = os.path.splitext(filename)
instance.file_mimetype, encoding = mimetypes.guess_type(filename) or ""
instance.file_filename, instance.file_extension = os.path.splitext(filename)
class DocumentType(models.Model):
name = models.CharField(max_length=32, verbose_name=_(u'name'))
@@ -30,66 +30,28 @@ class Document(models.Model):
"""
document_type = models.ForeignKey(DocumentType, verbose_name=_(u'document type'))
file = models.FileField(upload_to=get_filename_from_uuid)#lambda i,f: 'documents/%s' % i.uuid)
uuid = models.CharField(max_length=36, default=lambda:unicode(uuid.uuid4()), blank=True, editable=False)
#file = models.FileField(upload_to=get_filename_from_uuid)#lambda i,f: 'documents/%s' % i.uuid)
#file_mimetype = models.CharField(max_length=50, default="", editable=False)
#file_extension = models.CharField(max_length=10, default="", editable=False)
file_mimetype = models.CharField(max_length=50, default="", editable=False)
file_filename = models.CharField(max_length=64, default="", editable=False)
file_extension = models.CharField(max_length=10, default="", editable=False)
date_added = models.DateTimeField("added", auto_now_add=True)
date_updated = models.DateTimeField("updated", auto_now=True)
#def save_file(self, contents, save=False):
# " Save a file, creating a new document_version if necessary. "
# self.file.save(contents.name, contents, save=save)
# # This is now done elsewhere
# #self.file_mimetype = guess_type(contents.name) or ""
# #try:
# #self.file_extension = contents[contents.rindex(".")+1:] or ""
# #except ValueError:
# #pass
# #self.save()
class Meta:
verbose_name = _(u'document')
verbose_name_plural = _(u"documents")
verbose_name_plural = _(u'documents')
def __unicode__(self):
return self.uuid
#@property
#def friendly_filename(self):
# """ A friendly filename (ie not the UUID) for the user to see when they download.
# ''' A friendly filename (ie not the UUID) for the user to see when they download.
# Overload this with eg a slug field.
# """
# '''
# return 'untitled.%s' % self.file_extension
#def already(self, mode, request):
# """ Tests if a user has already viewed, downloaded or sent this document.
# Assumes this model has a log of document interactions.
# """
# mode = getattr(DocumentInteractionBase.MODES, mode.upper())
#
# if request.user.is_anonymous():
# return bool(self.interactions.filter(mode=mode, session_key=request.session.session_key))
# else:
# return bool(self.interactions.filter(mode=mode, user=request.user))
#@property
#def file_thumbnail_small(self):
# # TODO: subclass DjangoThumbnail to remove UUID from URL
# if DjangoThumbnail:
# return DjangoThumbnail(self.file.name, (200,200))
#@property
#def file_thumbnail_medium(self):
# # TODO: subclass DjangoThumbnail to remove UUID from URL
# if DjangoThumbnail:
# return DjangoThumbnail(self.file.name, (600,600))
class MetadataType(models.Model):
name = models.CharField(max_length=32, verbose_name=_(u'name'))
default = models.CharField(max_length=64, blank=True, null=True, verbose_name=_(u'default'))
@@ -101,22 +63,36 @@ class MetadataType(models.Model):
class Meta:
verbose_name = _(u'metadata type')
verbose_name_plural = _(u"metadata types")
verbose_name_plural = _(u'metadata types')
# @models.permalink
# def get_absolute_url(self):
# return ('state_list', [])
class DocumentTypeMetadataTypeConnector(models.Model):
class DocumentTypeMetadataType(models.Model):
document_type = models.ForeignKey(DocumentType, verbose_name=_(u'document type'))
metadata_type = models.ForeignKey(MetadataType, verbose_name=_(u'metadata type'))
#override default
#create index dir
#create index dir? -bool
#required? -bool
def __unicode__(self):
return '%s <-> %s' %(self.document_type, self.metadata_type)
class Meta:
verbose_name = _(u"document type metadata type connector")
verbose_name_plural = _(u"document type metadata type connectors")
verbose_name = _(u'document type metadata type connector')
verbose_name_plural = _(u'document type metadata type connectors')
class DocumentMetadata(models.Model):
document = models.ForeignKey(Document, verbose_name=_(u'document'))
metadata_type = models.ForeignKey(MetadataType, verbose_name=_(u'metadata type'))
value = models.TextField(blank=True, null=True, verbose_name=_(u'metadata value'))
def __unicode__(self):
return '%s <-> %s' %(self.document, self.metadata_type)
class Meta:
verbose_name = _(u'document metadata')
verbose_name_plural = _(u'document metadata')

11
apps/documents/urls.py Normal file
View File

@@ -0,0 +1,11 @@
from django.conf.urls.defaults import *
from django.utils.translation import ugettext_lazy as _
from django.views.generic.create_update import create_object, update_object
urlpatterns = patterns('documents.views',
url(r'^document/list/$', 'document_list', (), 'document_list'),
url(r'^document/create/$', 'document_create', (), 'document_create'),
#url(r'^document/upload/$', 'upload_document', (), 'upload_document'),
url(r'^document/type/(?P<document_type_id>\d+)/upload/$', 'upload_document_with_type', (), 'upload_document_with_type'),
)

66
apps/documents/views.py
View File

@@ -1 +1,65 @@
# Create your views here.
import datetime
from django.utils.translation import ugettext as _
from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404, redirect
from django.template import RequestContext
from django.contrib import messages
from django.views.generic.list_detail import object_detail, object_list
from django.core.urlresolvers import reverse
from django.views.generic.create_update import create_object
from django.forms.formsets import formset_factory
from models import Document, DocumentMetadata, DocumentType, MetadataType
from forms import DocumentTypeSelectForm, DocumentCreateWizard, \
MetadataForm, DocumentForm
def document_list(request):
return object_list(
request,
queryset=Document.objects.all(),
template_name='generic_list.html',
extra_context={
'title':_(u'documents'),
'extra_columns':[
{'name':_(u'filename'), 'attribute':'file_filename'},
{'name':_(u'extension'), 'attribute':'file_extension'},
{'name':_(u'mimetype'), 'attribute':'file_mimetype'},
{'name':_(u'added'), 'attribute':'date_added'},
],
},
)
def document_create(request):
MetadataFormSet = formset_factory(MetadataForm, extra=0)
wizard = DocumentCreateWizard(form_list=[DocumentTypeSelectForm, MetadataFormSet])
return wizard(request)
def upload_document_with_type(request, document_type_id):
document_type = get_object_or_404(DocumentType, pk=document_type_id)
if request.method == 'POST':
form = DocumentForm(request.POST, request.FILES, initial={'document_type':document_type})
if form.is_valid():
instance = form.save()
for key, value in request.GET.items():
document_metadata = DocumentMetadata(
document=instance,
metadata_type=get_object_or_404(MetadataType, pk=key),
value=value
)
document_metadata.save()
messages.success(request, _(u'Document uploaded successfully.'))
return HttpResponseRedirect(reverse('document_list'))
else:
form = DocumentForm(initial={'document_type':document_type})
return render_to_response('generic_form.html', {
'form':form
}, context_instance=RequestContext(request))