exersices 4.3 done

andreytp · andreytp · commit e9a58905c7b7 · 2020-07-02T19:37:54.000+03:00
diff --git a/mynotes/report.py b/mynotes/report.py
@@ -89,9 +89,6 @@ def print_report(report, total_cost, total_gain_lost, formatter):
                 'Price', 
                 'Change', 
                 'Gain/Lost']
-    # headers_len = len(headers)
-    # print('%10s '*headers_len % headers)
-    # print(('-'*10 + ' ')*headers_len)
 
     formatter.headings(headers)
 
@@ -118,8 +115,6 @@ def print_report(report, total_cost, total_gain_lost, formatter):
                 ' '*10, 
                 'Gain/lost', 
                 f'{total_gain_lost:>10.2f}']
-    # print(('-'*10 + ' ')*len(footer))
-    # print('%10s '*len(footer) % footer)
     formatter.footings(footers)
 
 def portfolio_report(portfoliofile, pricefile, fmt='txt'):
@@ -134,14 +129,7 @@ def portfolio_report(portfoliofile, pricefile, fmt='txt'):
     report, total_cost, total_gain_lost = make_report_data(portfolio, prices)
 
     # Print it out
-    if fmt == 'txt':
-        formatter = tableformat.TextTableFormatter()
-    elif fmt == 'csv':
-        formatter = tableformat.CSVTableFormatter()
-    elif fmt == 'html':
-        formatter = tableformat.HTMLTableFormatter()
-    else:
-        raise RuntimeError(f'Unknow format {fmt}')
+    formatter = tableformat.createformatter(fmt)
                 
     print_report(report, total_cost, total_gain_lost, formatter)
 
diff --git a/mynotes/stock.py b/mynotes/stock.py
@@ -12,4 +12,7 @@ def cost(self):
     def sell(self, count):
         if count > self.shares:
             raise NameError(f'Can\'t sell {count}. Shares not enogh')
-        self.shares -= count    
+        self.shares -= count
+        
+    def __repr__(self):
+        return f'Stock(\'{self.name}\', {self.shares:d}, {self.price:0.2f})'    
diff --git a/mynotes/tableformat.py b/mynotes/tableformat.py
@@ -64,4 +64,39 @@ def footings(self, footers):
         print('<tr>')
         for f in footers:
             print(f'<th>{f:s}</th>', end='')
-        print('</tr>')    
+        print('</tr>')
+        
+def create_formatter(fmt):
+    if fmt == 'txt':
+        formatter = TextTableFormatter()
+    elif fmt == 'csv':
+        formatter = CSVTableFormatter()
+    elif fmt == 'html':
+        formatter = HTMLTableFormatter()
+    else:
+        raise RuntimeError(f'Unknow format {fmt}')
+    return formatter
+    
+def print_table(collection, fields, formatter):
+    
+    formatter.headings(fields)
+    for item in collection:
+        rowdata = []
+        # print(item)
+        for field in fields:
+            strval = value_format(getattr(item, field))
+            # print(strval)
+            rowdata.append(strval)
+        formatter.row(rowdata)
+        
+def value_format(value):
+    if isinstance(value, int):
+        return f'{value:>10d}'
+        
+    if isinstance(value, float):
+        return f'{value:>10.2f}'
+        
+    return f'{value:>10s}'
+        
+    
+    
