Changeset 4877

Timestamp:

11/26/08 13:57:40 (1 month ago)

Author:

bobbysmith007

Message:

re #4150

Well after more work than anticipated, I have swapped out my uber-crappy struckthrough comment with one of the trac renderd diffs.

What it took:

• Having a plain text version of the estimate so that when diffing we are only diffing what we care about
  
• Pulling the diff_div.html template from trac and filling it with the appropriate data, then rendering that to a string
  
• which gets included on a ticket when the estimate changes
  
• Had to store the plain text version of the estimate in the db as well
  

Files:

• estimatorplugin/0.11/estimatorplugin/api.py (modified) (4 diffs)
• estimatorplugin/0.11/estimatorplugin/estimator.py (modified) (2 diffs)
• estimatorplugin/0.11/estimatorplugin/htdocs/estimate.css (modified) (3 diffs)
• estimatorplugin/0.11/estimatorplugin/htdocs/estimate.js (modified) (5 diffs)
• estimatorplugin/0.11/estimatorplugin/macro_provider.py (modified) (1 diff)
• estimatorplugin/0.11/estimatorplugin/templates/estimate.html (modified) (6 diffs)
• estimatorplugin/0.11/estimatorplugin/webui.py (modified) (10 diffs)

estimatorplugin/0.11/estimatorplugin/api.py

@@ -7 +7 @@
-from trac.env import IEnvironmentSetupParticipant
-
-1
+2
-dbkey = 'EstimatorPluginDbVersion'
-
@@ -30 +30 @@
-        """
-        ver = dbhelper.get_system_value(self.env, dbkey)
-ver
-
+int(ver)
+] 
-        return ans
-
@@ -53 +53 @@
-                     communication DECIMAL,
-                     tickets VARCHAR(512),
-VARCHAR(8000)
+text
-                 )""",[]),
-                ("""CREATE TABLE estimate_line_item(
@@ -62 +62 @@
-                     high DECIMAL
-                )""",[]))
+
+        if ver < 2:
+            self.log.debug('Creating Estimate and Estimate_Line_Item tables (Version 1)')
+            success = success and dbhelper.execute_in_trans(self.env, (""" ALTER TABLE estimate ADD COLUMN diffcomment text ; """,[]))
+
-        # SHOULD BE LAST IN THIS FUNCTION
-        if success:

estimatorplugin/0.11/estimatorplugin/estimator.py

@@ -2 +2 @@
-
-estimateUpdate = """
-
+, diffcomment=%s
-WHERE id=%s
-"""
-estimateInsert = """
-
-
+diffcomment, 
+%s,
-"""
-lineItemInsert = """
@@ -42 +42 @@
-    return dbhelper.get_scalar(env, "SELECT COMMENT FROM estimate WHERE ID=%s", 0, id)
-
+def getTextEstimate(env, id):
+    return dbhelper.get_scalar(env, "SELECT DIFFCOMMENT FROM estimate WHERE ID=%s", 0, id)
+
-estimateChangeTicketComment = """
-INSERT INTO ticket_change (ticket, time, author, field, oldvalue, newvalue)

estimatorplugin/0.11/estimatorplugin/htdocs/estimate.css

@@ -1 @@
-
+info
-  color:green;
-  border:2px solid green;
@@ -7 +7 @@
-}
-
-
+
+
+
+
+
+
+
+
+
-  text-align:right;
-  border:1px solid blue;
@@ -25 +33 @@
-text-decoration: line-through;
-}
+

estimatorplugin/0.11/estimatorplugin/htdocs/estimate.js

@@ -24 +24 @@
-}
-
-
+
+
+
+
+
+
+
+
+
-   //firefox 2 has a bug where it wont clone textarea values sometimes
+   // Optional pred arg determines whether or not a node should be cloned
+   var pred = arguments[1] || chromeCleanerPredicate;
-   var kid, cloned;
+   if (pred && !pred(node)) return null;
-   var newNode = node.cloneNode(false);
-   for(var i=0 ; kid=node.childNodes[i] ; i++){
-      if(kid.tagName && kid.tagName.toLowerCase()=='textarea'){
-textarea
-value = kid.value
+div
+innerHTML = kid.value.replace('\r\n','<br />', 'g').replace('\r','<br />', 'g').replace('\n','<br />', 'g')
-      }else{
-         cloned = evenDeeperClone(kid);
- 
-
+
+if(cloned) 
-   }
-   return newNode;
@@ -51 +62 @@
-   var tr = cn('tr', {},
-             cn('td', {},
-cols:30, style:"height: 34px
+style:"height: 68px; width:100%
-                   valFn('description'))),
-             cn('td', { valign:'top'},
@@ -165 +176 @@
-      }
-   }
-
+
+
+
+
-   return parent;
-}
@@ -183 +197 @@
-   return elem;
-}
+
+function prepareComment( preview ){
+   var s = "";
+   function walker ( node ){
+      for (var i=0, kid ; kid = node.childNodes[i]; i++ ){
+         if(kid && kid.tagName){
+            var tn = kid.tagName.toLowerCase();
+            if (tn == 'table'){
+               var print_sep = false;
+               for(var row,j=0 ; row = kid.rows[j] ; j++){
+                  if (row.className == "lineItemheader") print_sep = true;
+                  if (row.className == "lineItemFooter") print_sep = false;
+                  for(var cell, k=0 ; cell = row.cells[k] ; k++){
+                     var val = (cell.textContent || cell.innerText);
+                     if(val) s += val + ((k==0 && print_sep) ? "\n|  " :
+                                         (print_sep ? "  |  " : "\t"));
+                  }
+                  s += "\n";
+                  if(print_sep)s+="---------------------------\n";
+               }
+               s += "\n";
+            }
+         }
+      }
+   }
+   walker(preview);
+   return s;
+}
+
-function preparePreview(){
-   var preview = $$('estimateoutput');
@@ -188 +231 @@
-   preview.appendChild(removeFirstRow(removeInputsAndIds(evenDeeperClone($$('estimateParams')))));
-   preview.appendChild(removeInputsAndIds(evenDeeperClone($$('estimateBody'))));
+   //alert(prepareComment( preview ));
+   $$('diffcomment').value = prepareComment( preview );
-   $$('comment').value = preview.innerHTML;
-}

estimatorplugin/0.11/estimatorplugin/macro_provider.py

@@ -22 +22 @@
-        if html:
-            add_stylesheet(req, "Estimate/estimate.css")
+            add_stylesheet(req, "common/css/diff.css")
-            html+= '<br /><a href="%s?id=%s">edit this estimate</a>' % (req.href.Estimate(), id)
-        else:

estimatorplugin/0.11/estimatorplugin/templates/estimate.html

@@ -37 +37 @@
-          </tr>
-          <tr>
-
+         
-            <td><input id="rate" name="rate" type="text" onkeyup="runCalculation()"
-                      value="${estimate.rate}"
@@ -43 +43 @@
-          </tr>
-          <tr>
-
+  
-            <td><input id="variability" name="variability" type="text" onkeyup="runCalculation()"
-                      value="${estimate.variability}"
@@ -68 +68 @@
-
-          <tr id="lineItemFooter">
-
+         
-            <td id="lowTotal" class="numberCell" ></td>
-            <td id="highTotal" class="numberCell"></td>
@@ -75 +75 @@
-          </tr>
-          <tr>
-
+ 
-            <td id="lowAdjusted" class="numberCell" ></td>
-            <td id="highAdjusted" class="numberCell" ></td>
@@ -82 +82 @@
-          </tr>
-          <tr>
-
+          
-            <td id="lowCost" class="numberCell" ></td>
-            <td id="highCost" class="numberCell" ></td>
@@ -99 +99 @@
-
-            </div>
+            <textarea id="diffcomment" name="diffcomment" style="display:none;"></textarea>
-            <textarea id="comment" name="comment" style="display:none;"></textarea>
-        </div>

estimatorplugin/0.11/estimatorplugin/webui.py

@@ -11 +11 @@
-from trac.ticket import Ticket
-import datetime
+from trac.web.chrome import Chrome
-from trac.util.datefmt import utc, to_timestamp
+from trac.versioncontrol.diff import get_diff_options, diff_blocks
+from genshi.template import TemplateLoader
+from genshi.filters.transform import Transformer
+from trac.web.api import ITemplateStreamFilter
+
+
+# class EstimatorTicketStyleApplication(Component):
+#     implements(ITemplateStreamFilter)
+    
+#     def __init__(self):
+#         pass
+
+#     # ITemplateStreamFilter
+#     def filter_stream(self, req, method, filename, stream, data):
+#         self.log.debug("EstimatorTicketStyleApplication executing") 
+#         if not filename == 'ticket.html':
+#             self.log.debug("EstimatorTicketStyleApplication not the correct template")
+#             return stream
+#         #stream = stream | Transformer('//link[ends-with(@href,"trac.css")]').after(
+#         stream = stream | Transformer('//link[@href="/projects/test/chrome/common/css/trac.css")]').after(
+
+#             tag.link(type="text/css", rel="stylesheet", 
+#                        href=req.href.chrome("common", "css" , "diff.css"))()
+#             )
+#         return stream
+
+
-
-class EstimationsPage(Component):
@@ -17 +45 @@
-    def __init__(self):
-        pass
+
+    def get_diffs(self, req, old_text, new_text, id):
+        diff_style, diff_options, diff_data = get_diff_options(req)
+        diff_context = 3
+        for option in diff_options:
+            if option.startswith('-U'):
+                diff_context = int(option[2:])
+                break
+        if diff_context < 0:
+            diff_context = None
+        diffs = diff_blocks(old_text.splitlines(), new_text.splitlines(), context=diff_context,
+                            tabwidth=2,
+                            ignore_blank_lines=True,
+                            ignore_case=True,
+                            ignore_space_changes=True)
+        
+        chrome = Chrome(self.env)
+        loader = TemplateLoader(chrome.get_all_templates_dirs())
+        tmpl = loader.load('diff_div.html')
+        
+        title = "Estimate:%s Changed" %id
+        changes=[{'diffs': diffs, 'props': [],
+                  'title': title, 'href': req.href('Estimate', id=id),
+                  'new': {'path':title, 'rev':'', 'shortrev': '', 'href': req.href('Estimate', id=id)},
+                  'old': {'path':"", 'rev':'', 'shortrev': '', 'href': ''}}]
+
+        data = chrome.populate_data(req,
+                                    { 'changes':changes , 'no_id':True, 'diff':diff_data,
+                                      'longcol': '', 'shortcol': ''})
+        # diffs = diff_blocks("Russ Tyndall", "Russ Foobar Tyndall", context=None, ignore_blank_lines=True, ignore_case=True, ignore_space_changes=True)
+        # data = c._default_context_data.copy ()
+        diff_data['style']='sidebyside';
+        data.update({ 'changes':changes , 'no_id':True, 'diff':diff_data,
+                      'longcol': '', 'shortcol': ''})
+        stream = tmpl.generate(**data)
+        return stream.render()
+
+
-    def load(self, id, addMessage, data):
-        try:
@@ -38 +104 @@
-    def line_item_hash_from_args(self, args):
-        not_line_items=['__FORM_TOKEN','tickets','variability','communication',
-
+, 'diffcomment'
-        itemReg = re.compile(r"(\D+)(\d+)")
-        lineItems = {}
@@ -50 +116 @@
-        return lineItems
-
-
-
+, new_text
+#
-            estimate_rs = getEstimateResultSet(self.env, id)
-            tickets = estimate_rs.value('tickets', 0)
-comment = estimate_rs.value('
+old_text = estimate_rs.value('diff
-            tickets = [int(t.strip()) for t in tickets.split(',')]
-
+
+
+
+
+
+
-            return [(estimateChangeTicketComment,
-                     [t,
@@ -63 +134 @@
-                      to_timestamp(datetime.datetime.now(utc)) - 1,
-                      req.authname,
-
+
+
-                    for t in tickets]
-
+#
-            self.log.error("Error saving old ticket changes: %s" % e)
-            addMessage("Tickets must be numbers")
@@ -89 +161 @@
-    def save_from_form (self, req, addMessage):
-        #try:
-
-            args = req.args
-            tickets = args["tickets"]
@@ -103 +174 @@
-            else:
-                self.log.debug('Saving edited estimate')
-
+, args['diffcomment']
-                sql = estimateUpdate
-            self.log.debug('Old Tickets to Update: %r' % old_tickets)
-            estimate_args = [args['rate'], args['variability'],
-                             args['communication'], tickets,
-
+args['diffcomment'], 
-            saveEstimate = (sql, estimate_args)
-            saveLineItems = []
@@ -148 +219 @@
-                if self.notify_new_tickets( req, id, tickets, addMessage):
-                    addMessage("Estimate Saved!")
-
+&justsaved=true
-            else:
-                addMessage("Failed to save! %s" % result)
@@ -167 +238 @@
-        # for tickets with only old estimates on them, we would still like to apply style
-        url = req.href.Estimate()
-
+#
-        if req.perm.has_permission("TICKET_MODIFY"):
-            yield 'mainnav', "Estimate", \
-
-
-
-
-
+
+
-
-    # IRequestHandler methods
@@ -203 +271 @@
-        if req.args.has_key('id') and req.args['id'].strip() != '':
-            self.load(int(req.args['id']), addMessage, data)
-
+
+
+
+
+
+
-
-        add_script(req, "Estimate/JSHelper.js")