website Changeset - 8cb1f3f685eb · Conservancy Kallithea

Changeset - 8cb1f3f685eb

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Brett Smith (brett) - 7 years ago 2016-11-29 18:13:40
brett@sfconservancy.org

js: Use three-part progressbar when no middle goal defined.

Since our current fundraiser doesn't have a "middle goal," this makes
it a little easier to maintain the template and do the math.

1 file changed with 9 insertions and 7 deletions:

www/conservancy/static/js/supporter-page.js

0 comments (0 inline, 0 general)

www/conservancy/static/js/supporter-page.js

➞

Show inline comments

@@ ... / @@ -27,61 +27,63 @@ $(document).ready(function() { @@
     var noCommaSiteSoFar = parseInt(siteSoFar.replace(/,/g, ""));
     var siteMatchCount = $('span#site-fundraiser-match-count').text();
     var noCommaSiteMatchCount = parseInt(siteMatchCount.replace(/,/g, ""));
     if (! noCommaSiteMatchCount) {
         noCommaSiteMatchCount = "0";
+    }
     var noCommaMatchFinalGoal = noCommaSiteFinalGoal - noCommaSiteMatchCount;
     var goal  = $('span#fundraiser-goal').text();
     var soFar = $('span#fundraiser-so-far').text();
     var donationCount = $('span#fundraiser-donation-count').text();
     var noCommaGoal = parseFloat(goal.replace(/,/g, ""));
     var noCommaSoFar = parseFloat(soFar.replace(/,/g, ""));
     var noCommaDonationCount = parseInt(donationCount.replace(/,/g, ""));
     var percentage = (parseFloat(noCommaSoFar) / parseFloat(noCommaGoal)) * 100;
     var curValue = 0.00;
     var incrementSoFar = 0.00;
     var curDonationCount = 0;
     var riseLevelPercent = 0.5;
     var incrementDonationCount = Math.round( (riseLevelPercent / 100) * noCommaDonationCount );
     $('#siteprogressbar').empty();
     if (noCommaSiteSoFar >= noCommaSiteMiddleGoal) {
         // We've got
         var leftOver = noCommaMatchFinalGoal - noCommaSiteSoFar;
         var supporterProgress = (noCommaSiteSoFar / noCommaSiteFinalGoal) * 100;
         var matchProgress = (noCommaSiteMatchCount / noCommaSiteFinalGoal) * 100;
         var needProgress = 100 - matchProgress;
         $('#siteprogressbar').
             multiprogressbar({ parts: [
-                { value: (noCommaSiteSoFar / noCommaSiteFinalGoal) * 100,
+                { value: supporterProgress,
                   text: noCommaSiteSoFar.toLocaleString() + " have joined!",
                   barClass: "progress", textClass: "soFarText" },
                 { value:
                   ((noCommaMatchFinalGoal - noCommaSiteMiddleGoal) / noCommaSiteFinalGoal) * 100,
                   text: leftOver.toLocaleString() + " more needed to save license compliance work.",
                 { value: needProgress,
                   text: leftOver.toLocaleString() + " more needed",
                   barClass: "final-goal", textClass: "goalText" },
                 {  value: 100,
                    text: siteMatchCount + " matched!",
                    barClass: "progress", textClass: "soFarText" },
                 { value: 100,
                   text: noCommaSiteMatchCount.toLocaleString() + " matched!",
                   barClass: "progress", textClass: "soFarText" },
             ]});
     } else {
         $('#siteprogressbar').
             multiprogressbar({ parts: [
                 { value: (noCommaSiteSoFar / noCommaSiteFinalGoal) * 100,
                   text: siteSoFar + " joined!",
                   barClass: "progress", textClass: "soFarText" },
                 { value: ((noCommaSiteMiddleGoal - noCommaSiteSoFar) / noCommaSiteFinalGoal) * 100,
                   text: siteMiddleGoal + " will save our basic work",
                   barClass: "middle-goal", textClass: "goalText" },
                 { value:
                   ((noCommaMatchFinalGoal - noCommaSiteMiddleGoal) / noCommaSiteFinalGoal) * 100,
                   text: noCommaMatchFinalGoal.toLocaleString() + " will save license compliance",
                   barClass: "final-goal", textClass: "goalText" },
                 {  value: 100,
                    text: siteMatchCount + " matched!",
                    barClass: "progress", textClass: "soFarText" },
             ]});
+    }
     $('span#fundraiser-percentage').css({ 'color'        : 'green',
                                           'font-weight'  : 'bold',
                                           'float'        : 'right',
                                           'margin-right' : '40%',
                                           'margin-top'   : '2.5%',

0 comments (0 inline, 0 general)