Changeset 3039

Timestamp:

01/11/08 15:31:58 (1 year ago)

Author:

bobbysmith007

Message:

Got everything rough draft working. We now add a macro call to the ticket description to display the estimate. I make a ticket change to record the comment, but it is coming up as html instead of rendering

Files:

• estimatorplugin/0.11/estimatorplugin/estimator.py (modified) (1 diff)
• estimatorplugin/0.11/estimatorplugin/htdocs/estimate.js (modified) (2 diffs)
• estimatorplugin/0.11/estimatorplugin/macro_provider.py (modified) (1 diff)
• estimatorplugin/0.11/estimatorplugin/templates/estimate.html (modified) (1 diff)
• estimatorplugin/0.11/estimatorplugin/webui.py (modified) (7 diffs)
• estimatorplugin/0.11/setup.py (modified) (1 diff)

estimatorplugin/0.11/estimatorplugin/estimator.py

@@ -41 +41 @@
-def getHtmlEstimate(id):
-    return dbhelper.get_scalar("SELECT COMMENT FROM estimate WHERE ID=%s", 0, id)
+
+estimateChangeTicketComment = """
+INSERT INTO ticket_change (ticket, time, author, field, oldvalue, newvalue)
+VALUES ( %s, %s, %s, 'estimate',  '', %s )
+"""

estimatorplugin/0.11/estimatorplugin/htdocs/estimate.js

@@ -26 +26 @@
-function evenDeeperClone(node){
-   //firefox 2 has a bug where it wont clone textarea values sometimes
-
+
+
-   for(var i=0 ; kid=node.childNodes[i] ; i++)
-      kids[i] = evenDeeperClone(kid);
@@ -33 +34 @@
-   if (node.value) hsh.value = node.value;
-   if (node.type && node.type!='textarea') hsh.type = node.type
-
-   if (node.tagName) newNode = cn(node.tagName, hsh, kids);
-
+
+
+
+
+
+
+
+
+
-   return newNode;
-}

estimatorplugin/0.11/estimatorplugin/macro_provider.py

@@ -41 +41 @@
-        """
-        #try:
-        x = dir(self)
-        x.sort()
-        self.log.debug('what? : %s, %r' % (self, x))
-        return self.estimate_macro(int(content), formatter.req)
-        #except:

estimatorplugin/0.11/estimatorplugin/templates/estimate.html

@@ -106 +106 @@
-           var lineItems = ${estimate.lineItems};
-           loadLineItems();
-
+if(lineItems.length == 0) 
-        </script >
-      </div>

estimatorplugin/0.11/estimatorplugin/webui.py

@@ -9 +9 @@
-from trac.web.href import Href
-from estimator import *
-
+
+
+
-
-class EstimationsPage(Component):
@@ -15 +17 @@
-    def __init__(self):
-        pass
-req
+id
-        try:
-            id = int(req.args['id'])
-            data["estimate"]["id"] = id
-            estimate_rs = getEstimateResultSet(id)
@@ -32 +33 @@
-                addMessage('Cant Find Estimate Id: %s' % id)
-        except Exception, e:
-req.args['id']
+id
-            addMessage('Error: %s' % e)
+            
-    def line_item_hash_from_args(self, args):
-        not_line_items=['__FORM_TOKEN','tickets','variability','communication',
@@ -47 +49 @@
-         if not(not_line_items.__contains__(item[0]))]
-        return lineItems
+
+    def notify_old_tickets(self, req, id, addMessage, changer):
+        try:
+            estimate_rs = getEstimateResultSet(id)
+            tickets = estimate_rs.value('tickets', 0)
+            comment = estimate_rs.value('comment', 0)
+            tickets = [int(t.strip()) for t in tickets.split(',')]
+            self.log.debug('Notifying old tickets of estimate change: %s' % tickets)
+            return [(estimateChangeTicketComment,
+                     [t,
+                      to_timestamp(datetime.datetime.now(utc)),
+                      req.authname,
+                      "<del>%s</del>" % comment])
+                    for t in tickets]
+        except Exception, e:
+            self.log.error("Error saving old ticket changes: %s" % e)
+            addMessage("Tickets must be numbers")
+            return None
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        #try:
+
+            args = req.args
-            tickets = args["tickets"]
-            id = args["id"]
+            old_tickets = None
-            if id == None or id == '' :
+                self.log.debug('Saving new estimate')
-                sql = estimateInsert
-                id = nextEstimateId ()
-            else:
+                self.log.debug('Saving edited estimate')
+                old_tickets = self.notify_old_tickets(req, id, addMessage, req.authname)
-                sql = estimateUpdate
-
+
-            estimate_args = [args['rate'], args['variability'],
-                             args['communication'], tickets,
@@ -87 +129 @@
-
-            sql = removeLineItemsNotInListSql % ','.join(ids)
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            #will be true or Exception
-            if result == True:
-                addMessage("Estimate Saved!")
+                if self.notify_new_tickets( req, id, tickets, addMessage):
+                    req.redirect(req.href.Estimate()+'?id=%s'%id)
-            else:
-                addMessage("Failed to save! %s" % result)
@@ -124 +172 @@
-        def addMessage(s):
-            messages.extend([s]);
-
+#
-        if req.method == 'POST':
-.args
+
-        data = {}
-        data["estimate"]={
@@ -140 +188 @@
-        
-        if req.args.has_key('id') and req.args['id'].strip() != '':
-req
+int(req.args['id'])
-
-

estimatorplugin/0.11/setup.py

@@ -4 +4 @@
-
-setup(name=PACKAGE,
-1
+2
-      packages=[PACKAGE],
-      url='http://www.trac-hacks.org/wiki/EstimatorPlugin',