Changeset 7ed402e

Timestamp:

02/20/12 16:58:37 (15 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test

Children:

9290fec

Parents:

9f838ba

git-author:

yomguy <yomguy@…> (02/20/12 16:58:37)

git-committer:

yomguy <yomguy@…> (02/20/12 16:58:37)

Message:

add Format (LAM) and various enumerations, add last revision to item detail

Files:

• README.rst (modified) (1 diff)
• telemeta/admin.py (modified) (2 diffs)
• telemeta/models/enum.py (modified) (6 diffs)
• telemeta/models/media.py (modified) (1 diff)
• telemeta/templates/telemeta/mediaitem_detail.html (modified) (1 diff)
• telemeta/views/base.py (modified) (2 diffs)
• tools/dev/pypi.sh (added)

README.rst

@@ -86 +86 @@
     $ git clone http://vcs.parisson.com/git/telemeta.git
 
-Licence
+License
 =======
 

telemeta/admin.py

@@ -74 +74 @@
     ordering = ['-time']
 
+class FormatAdmin(admin.ModelAdmin):
+    search_fields = ['code', 'vendor']
 
 admin.site.register(MediaFonds, MediaFondsAdmin)
@@ -97 +99 @@
 
 admin.site.register(Revision, RevisionAdmin)
+
+admin.site.register(Format, FormatAdmin)

telemeta/models/enum.py

@@ -40 +40 @@
     "Abstract enumerations base class"
     value = CharField(_('value'), required=True, unique=True)
-    
+
     def __unicode__(self):
         return self.value
@@ -78 +78 @@
         verbose_name = _("record author")
 
-class MetadataWriter(Enumeration):  
+class MetadataWriter(Enumeration):
     "Collection metadata writer"
 
@@ -86 +86 @@
 
 class LegalRight(Enumeration):
-    "Collection legal rights" 
+    "Collection legal rights"
 
     class Meta(MetaEnumeration):
@@ -127 +127 @@
         verbose_name = _("keyword")
 
-class Publisher(Enumeration): 
+class Publisher(Enumeration):
     "Collection publisher"
 
@@ -154 +154 @@
 
 class EthnicGroupAlias(ModelCore):
-    "Item ethnic group other name" 
+    "Item ethnic group other name"
     ethnic_group = ForeignKey('EthnicGroup', related_name="aliases", verbose_name=_('population / social group'))
     value        = CharField(_('name'), required=True)
@@ -163 +163 @@
         ordering = ['ethnic_group__value']
 
+# Tape formats
+class TapeLength(Enumeration):
+    "Tape length (cm)"
 
+    class Meta(MetaEnumeration):
+        db_table = 'tape_length'
+        verbose_name = _("tape length (cm)")
+
+class TapeWidth(Enumeration):
+    "Tape width (inch)"
+
+    class Meta(MetaEnumeration):
+        db_table = 'tape_width'
+        verbose_name = _("tape width (inch)")
+
+class TapeSpeed(Enumeration):
+    "Tape speed (m/s)"
+
+    class Meta(MetaEnumeration):
+        db_table = 'tape_speed'
+        verbose_name = _("tape speed (m/s)")
+
+class TapeVendor(Enumeration):
+    "Tape vendor"
+
+    class Meta(MetaEnumeration):
+        db_table = 'tape_vendor'
+        verbose_name = _("tape vendor")
+

telemeta/models/media.py

@@ -676 +676 @@
         verbose_name_plural = _('fonds related media')
 
+
+class Format(ModelCore):
+    """ Physical format object as proposed by the LAM"""
+
+    item = ForeignKey(MediaItem, related_name="formats", verbose_name=_('item'))
+    original_code = CharField(_('original code'), required=True)
+    support_number = CharField(_('support number'))
+    status = CharField(_('status'))
+    conservation_state = CharField(_('conservation state'))
+    comments = TextField(_('comments'))
+
+    tape_length = WeakForeignKey(TapeLength, related_name="formats", verbose_name = _("tape length (cm)"))
+    tape_width  = WeakForeignKey(TapeWidth, related_name="formats", verbose_name = _("tape width (inch)"))
+    tape_speed = WeakForeignKey(TapeSpeed, related_name="formats", verbose_name = _("tape speed (m/s)"))
+    tape_vendor = WeakForeignKey(TapeVendor, related_name="formats")
+    tape_thickness = CharField(_('tape thickness (um)'))
+    tape_diameter = CharField(_('tape diameter (mm)'))
+    tape_reference = CharField(_('tape reference'))
+
+    class Meta(MetaCore):
+        db_table = 'media_formats'
+        verbose_name = _('format')
+
+    def __unicode__(self):
+        return self.original_code
+
+    @property
+    def public_id(self):
+        return self.original_code
+

telemeta/templates/telemeta/mediaitem_detail.html

@@ -196 +196 @@
             <dd>{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}</dd>
 
+            {% if last_revision %}
+            <dt>{% trans "Last modification" %}</dt>
+            <dd>{{ last_revision.time }}</dd>
+            {% endif %}
+            
         </dl>
         {% endblock general_info %}

telemeta/views/base.py

@@ -630 +630 @@
         related_media = MediaItemRelated.objects.filter(item=item)
         check_related_media(related_media)
+        last_revision = Revision.objects.filter(element_type='item', element_id=item.id).order_by('-time')[0]
 
         return render(request, template,
@@ -637 +638 @@
                     'previous' : previous, 'next' : next, 'marker': marker_id, 'playlists' : playlists,
                     'public_access': public_access, 'width': width, 'height': height,
-                    'related_media': related_media, 'mime_type': mime_type,
+                    'related_media': related_media, 'mime_type': mime_type, 'last_revision': last_revision,
                     })