Changeset 3077

Timestamp:

31 Jan 2008, 22:05:11 (17 years ago)

Author:

Henrik Bettermann

Message:

archiveBatch fixed (Joachim, wie konnte das bei dir funktionieren??)

archive file reorganized

pins_view and psm beautified

Location:

WAeUP_SRP/base

Files:

• ScratchCards.py (modified) (3 diffs)
• skins/waeup_pins/archive.py (modified) (1 diff)
• skins/waeup_pins/archive_delete.py (modified) (1 diff)
• skins/waeup_pins/pins_view.pt (modified) (1 diff)

WAeUP_SRP/base/ScratchCards.py

@@ -143 +143 @@
         export_file = "%s/export/%s-%s_archive_%s.csv" % (i_home,prefix,batch_no,current)
         lines = []
-        fields = ['prefix','cost','serial','pin','student']
+        fields = ['prefix','serial','pin','student']
         headline = ','.join(fields)
         out = open(export_file,"wb")
+        out.write('%(prefix)s,%(cost)8.2f,%(batch_no)d,%(nr)d,%(sold)s\n\n' % vars())
         out.write(headline +'\n')
-        out.write('%(prefix)s,%(cost)8.2f,%(batch_no)d,%(nr)d,%(sold)s\n' % vars())
         out.close()
         out = open(export_file,"a")
@@ -156 +156 @@
                                                                     batch_no,
                                                                     len(pins)))
-            
+
         pin_list = []
         for pin in pins:
@@ -167 +167 @@
         if delete:
             for pin in pin_list:
-                self.deleteRecord(pin)
-            msg = "deleted %(total)d pin from pins_catalog" % len(pin_list)
+                self.portal_pins.deleteRecord(pin)
+            msg = "deleted %d pin from portal_pins" % len(pin_list)
             logger.info(msg)
     ###)

WAeUP_SRP/base/skins/waeup_pins/archive.py

@@ -25 +25 @@
         ob = getattr(context, id)
         ob['archiveBatch']()
-    message = 'portal_status_message=%s archived' % ' '.join(ids)
+    message = 'portal_status_message=%s archived!' % ' '.join(ids)
 else:
-    message = 'portal_status_message=psm_select_at_least_one_document'
+    message = 'portal_status_message=Select at least one batch to archive!'
 
 if REQUEST is not None:

WAeUP_SRP/base/skins/waeup_pins/archive_delete.py

@@ -24 +24 @@
     context.manage_delObjects(ids)
 else:
-    message = 'portal_status_message=select at least one batch to archive and delete'
+    message = 'portal_status_message=Select at least one batch to archive and delete!'
 
 if REQUEST is not None:
     return REQUEST.RESPONSE.redirect("%s?%s" % (context.absolute_url(), message))
-    
+

WAeUP_SRP/base/skins/waeup_pins/pins_view.pt

@@ -88 +88 @@
                        % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))"
                        />
-                <input type="submit" name="archive:method" value="archive"
+                <input type="submit" name="archive:method" value="Archive"
+                       class="destructive" i18n:attributes="value"
+                       />
+                <input type="submit" name="archive_delete:method" value="Archive & Delete"
                        class="destructive" i18n:attributes="value"
                        tal:attributes="onclick python:'return window.confirm(\'%s\')' %
-                       ('confirm archive', )" 
-                       />
-                <input type="submit" name="archive_delete:method" value="archive + delete"
-                       class="destructive" i18n:attributes="value"
-                       tal:attributes="onclick python:'return window.confirm(\'%s\')' %
-                       ('confirm archive and delete', )" 
+                       ('Do you really want to delete the pin batch?', )" 
                        />
             </td>