Merge pull request #81 from synhack/Fix_graph's_color

Fix graph's color

Author: y0no

phishing/jinja2/phishing/campaign_dashboard.html

@@ -49,8 +49,8 @@
         };
         var colors_list = [
             //Light1
-            "#EC7553",
             "#3A7696",
+            "#EC7553",
             "#ECA653",
             "#3BA76D",
             //Basic
@@ -182,15 +182,25 @@
         }
 
         function load_pie(canvas, values) {
+            var labels = [];
+            var data = [];
+            var pie_color = [];
+
+            Object.keys(values).map(function (key) {
+                labels.push(key);
+                data.push(values[key]['value']);
+
+                if (values[key]['color'])
+                    pie_color.push(values[key]['color']);
+            });
+
             var data = {
-                labels: Object.keys(values),
+                labels: labels,
                 datasets: [
                     {
-                        data: Object.keys(values).map(function (key) {
-                            return values[key];
-                        }),
-                        backgroundColor: colors_list,
-                        hoverBackgroundColor: colors_list
+                        data: data,
+                        backgroundColor: pie_color.length ? pie_color : colors_list,
+                        hoverBackgroundColor: pie_color.length ? pie_color : colors_list,
                     }
                 ]
             };

phishing/jinja2/phishing/dashboard_parts/attachment.html

@@ -0,0 +1,13 @@
+{% if graphs.attachment_executed_pie %}
+    <div class="col-md-3">
+        <h3>{% trans %}Attachment open{% endtrans %}</h3>
+        <canvas id="attachment_executed_pie"></canvas>
+        {% if graphs.attachment_executed_opened_tracker_count %}
+            <p title="{% trans %}This number is the sum of ALL the attachment opened. One people can open one the attachment several times{% endtrans %}">
+                <b>{% trans %}Total opened{% endtrans %}:</b> {{ graphs.attachment_executed_opened_tracker_count }}
+            </p>
+        {% else %}
+            <b>{% trans %}Not opened{% endtrans %}</b>
+        {% endif %}
+    </div>
+{% endif %}

phishing/jinja2/phishing/dashboard_parts/email_open.html

@@ -2,6 +2,12 @@
     <div class="col-md-3">
         <h3>{% trans %}Emails open{% endtrans %}</h3>
         <canvas id="email_open_pie"></canvas>
-        <p><b>{% trans %}Total opened{% endtrans %}:</b> {{ graphs.email_open_opened_tracker_count or 0 }}</p>
+        {% if graphs.email_open_opened_tracker_count %}
+            <p title="{% trans %}This number is the sum of ALL the email opened. One people can open one the email several times{% endtrans %}">
+                <b>{% trans %}Total opened{% endtrans %}:</b> {{ graphs.email_open_opened_tracker_count }}
+            </p>
+        {% else %}
+            <b>{% trans %}Not opened{% endtrans %}</b>
+        {% endif %}
     </div>
 {% endif %}

phishing/jinja2/phishing/dashboard_parts/landing_page.html

@@ -2,14 +2,26 @@
     <div class="col-md-3">
         <h3>{% trans %}Landing page open{% endtrans %}</h3>
         <canvas id="landing_page_open_pie"></canvas>
-        <p><b>{% trans %}Total open{% endtrans %}:</b> {{ graphs.landing_page_open_pie.opened or 0 }}</p>
+        {% if graphs.landing_page_open_opened_tracker_count %}
+            <p  title="{% trans %}This number is the sum of ALL the landingpage opened. One people can open one the landingpage several times{% endtrans %}">
+                <b>{% trans %}Total opened{% endtrans %}:</b> {{ graphs.landing_page_open_opened_tracker_count }}
+            </p>
+        {% else %}
+            <b>{% trans %}Not opened{% endtrans %}</b>
+        {% endif %}
     </div>
 {% endif %}
 
 {% if graphs.landing_page_post_pie %}
     <div class="col-md-3">
         <h3>{% trans %}Landing page post{% endtrans %}</h3>
         <canvas id="landing_page_post_pie"></canvas>
-        <p><b>{% trans %}Total POST{% endtrans %}:</b> {{ graphs.landing_page_post_pie.yes or 0 }}</p>
+        {% if graphs.landing_page_post_yes_tracker_count %}
+            <p  title="{% trans %}This number is the sum of ALL the post on the landingpage opened. One people can post multiple times on the landingpage.{% endtrans %}">
+                <b>{% trans %}Total posted{% endtrans %}:</b> {{ graphs.landing_page_post_yes_tracker_count }}
+            </p>
+        {% else %}
+            <b>{% trans %}Not opened{% endtrans %}</b>
+        {% endif %}
     </div>
 {% endif %}

phishing/tests/campaign.py

@@ -115,16 +115,17 @@ def check(var_name, group1_count, group2_count):
             )
 
             # check values
-            self.assertEqual(data.get(target_group1_name, 0), group1_count,
+            self.assertEqual(data.get(target_group1_name, 0)['value'], group1_count,
                              test_infos)
-            self.assertEqual(data.get(target_group2_name, 0), group2_count,
+            self.assertEqual(data.get(target_group2_name, 0)['value'], group2_count,
                              test_infos)
 
         # email open check
         self.assertContains(resp, 'id="target_group_email_open_pie"')
         check('target_group_email_open_pie', 2, 1)
 
         # open landing page
+        
         self.assertContains(resp, 'id="target_group_landing_page_open_pie"')
         check('target_group_landing_page_open_pie', 1, 2)
 

phishing/views/campaign.py

@@ -79,7 +79,7 @@ def add_histogram_value(name, datetime, value):
         # add value
         graphs[graph_name][value][to_hour_timestamp(datetime)] += 1
 
-    def add_pie_value(name, value):
+    def add_pie_value(name, value, fixed_color=''):
         """Add value to pie graph.
 
         :param name: graph name
@@ -91,28 +91,33 @@ def add_pie_value(name, value):
             graphs[graph_name] = {}
 
         if value not in graphs[graph_name]:
-            graphs[graph_name][value] = 1
-        else:
-            graphs[graph_name][value] += 1
+            graphs[graph_name][value] = {
+                'value': 0,
+                'color': fixed_color,
+            }
+
+        graphs[graph_name][value]['value'] += 1
 
     def clean_name(name):
         return re.sub('[^0-9a-zA-Z]+', '_', name)
 
     # generate tracker graph
     for tracker in Tracker.objects.filter(campaign_id=pk) \
-            .order_by('-created_at'):
+            .order_by('created_at'):  # order column (in user details)
         # init targets details
         if tracker.target_id not in targets_details:
             targets_details[tracker.target_id] = OrderedDict({
                 'email': tracker.target.email,
             })
-
         # add values
         key = clean_name(tracker.key)
         targets_details[tracker.target_id][tracker.key] = tracker
         value = '%s (%s)' % (tracker.key, tracker.value)
+        unchanged_value = (
+              tracker.updated_at - tracker.created_at).total_seconds() < 1
+        pie_color_value = '#bdc3c7' if unchanged_value else '#e67e22'
 
-        add_pie_value(key, value)
+        add_pie_value(key, value, pie_color_value)
         add_histogram_value(key, tracker.updated_at, value)
 
         # can has trakerInfos entry ?
@@ -190,7 +195,7 @@ def clean_name(name):
     # init graph layout
     tabs_layout = OrderedDict()
     tabs_layout['Global'] = ['global.html', 'email_open.html',
-                             'landing_page.html']
+                             'landing_page.html', 'attachment.html']
 
     # add target group graph
     if campaign.target_groups.count() > 1: