Changeset 2671

Timestamp:

02/11/06 22:25:37 (18 years ago)

Author:

jerome

Message:

Now pkbcodes displays percent done for all actions.

Files:

• pykota/trunk/bin/pkbcodes (modified) (4 diffs)

pykota/trunk/bin/pkbcodes

@@ -90 +90 @@
             
         if options["delete"] :    
-            self.display("%s...\n" % _("Processing"))
+            self.display("%s...\n" % _("Deletion"))
             todelete = self.storage.getMatchingBillingCodes(",".join(names))
             nbtotal = len(todelete)
@@ -97 +97 @@
                 percent = 100.0 * float(i) / float(nbtotal)
                 self.display("\r%.02f%%" % percent)
-            self.display("\r100.00%%\r        ")
-            self.display("\r%s\n" % _("Done."))
         else :
-            if (options["list"] or options["reset"]) and not names :
-                names = ["*"]
-                
             if options["add"] :    
+                self.display("%s...\n" % _("Creation"))
                 billingcodes = []
-                for bname in names :
+                nbtotal = len(names)
+                for i in range(nbtotal) :
+                    bname = names[i]
                     billingcode = self.storage.getBillingCode(bname)
                     if billingcode.Exists :
@@ -119 +117 @@
                         else :     
                             billingcodes.append(billingcode)
+                    percent = 100.0 * float(i) / float(nbtotal)
+                    self.display("\r%.02f%%" % percent)
+                self.display("\r100.00%%\r        \r%s\n" % _("Done."))
             else :        
+                if not names :
+                    names = ["*"]
                 billingcodes = self.storage.getMatchingBillingCodes(",".join(names))
                 if not billingcodes :
                     raise PyKotaCommandLineError, _("There's no billingcode matching %s") % " ".join(names)
                         
-            for billingcode in billingcodes :        
+            nbtotal = len(billingcodes)            
+            if not options["list"] :
+                self.display("Modification...\n")
+            for i in range(nbtotal) :        
+                billingcode = billingcodes[i]
                 if options["list"] :    
                     print "%s [%s] %s %s %s %.2f %s" % \
@@ -138 +145 @@
                     if options["description"] is not None :
                         billingcode.setDescription(options["description"].strip())
+                    percent = 100.0 * float(i) / float(nbtotal)
+                    self.display("\r%.02f%%" % percent)
+                        
+        if not options["list"] :                
+            self.display("\r100.00%%\r        \r%s\n" % _("Done."))
                      
 if __name__ == "__main__" :