Merge pull request #114 from ar2rsawseen/master

All Apps empty view + prod/dev switch + fixes
Countly · Dec 16, 2014 · 8f9317d · 8f9317d
2 parents e744f5a + d5c9414
commit 8f9317d
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 22 deletions.
diff --git a/api/parts/data/usage.js b/api/parts/data/usage.js
@@ -380,7 +380,7 @@ var usage = {},
                     recvMetricValue = params.qstring.metrics[tmpMetric.name];
 
                 if (recvMetricValue) {
-                    var escapedMetricVal = recvMetricValue.replace(/^\$/, "").replace(/\./g, ":");
+                    var escapedMetricVal = (recvMetricValue+"").replace(/^\$/, "").replace(/\./g, ":");
                     needsUpdate = true;
                     tmpSet["meta." + tmpMetric.set] = escapedMetricVal;
                     common.fillTimeObject(params, tmpTimeObj, escapedMetricVal + '.' + common.dbMap['total']);

diff --git a/frontend/express/app.js b/frontend/express/app.js
@@ -233,7 +233,8 @@ app.get('/dashboard', function (req, res, next) {
                             userOfApps:userOfApps,
                             countlyVersion:"14.08",
                             member:member,
-			                cdn: countlyConfig.cdn || ""
+			                cdn: countlyConfig.cdn || "",
+							production: countlyConfig.production || false
                         });
                     });
                 }

diff --git a/frontend/express/config.sample.js b/frontend/express/config.sample.js
@@ -20,7 +20,8 @@ var countlyConfig = {
         port: 6001,
         host: "localhost",
         use_intercom: true
-    }
+    },
+    production: true
 };
 
 module.exports = countlyConfig;
diff --git a/frontend/express/public/javascripts/countly/countly.template.js b/frontend/express/public/javascripts/countly/countly.template.js
@@ -2871,7 +2871,7 @@ window.EnterpriseView = countlyView.extend({
 window.AllAppsView = countlyView.extend({
 	selectedView:"#draw-total-sessions",
 	selectedApps: {"all":true},
-	selectedCount: 1,
+	selectedCount: 0,
 	initialize:function () {
         this.template = Handlebars.compile($("#template-allapps").html());
     },
@@ -2931,7 +2931,7 @@ window.AllAppsView = countlyView.extend({
 		$("#sidebar-menu > .item").addClass("hide");
 		$("#management-menu").removeClass("hide");
 		$("#enterprise-menu").removeClass("hide");
-		$("#allapps-menu").removeClass("hide").css("display", "inline");
+		$("#allapps-menu").removeClass("hide").css("display", "inline-block");
         var appData = countlyAllApps.getData();
 
         this.templateData = {
@@ -3010,21 +3010,34 @@ window.AllAppsView = countlyView.extend({
 						row.find(".check").removeClass("icon-check").addClass("icon-unchecked");
 						row.find(".color").css("background-color", "transparent");
 						delete self.selectedApps[row.attr("id")];
-						self.selectedCount--;
+						if(row.attr("id") != "all")
+							self.selectedCount--;
+						if(self.selectedCount==0){
+							$("#empty-graph").show();
+							$(".big-numbers").removeClass("active");
+							$(".big-numbers .select").removeClass("selected");
+						}
+
 					}
-					else if(self.selectedCount <= 10 || row.attr("id") == "all"){
+					else if(self.selectedCount < 10 || row.attr("id") == "all"){
+						if(self.selectedCount==0){
+							$("#empty-graph").hide();
+							$(self.selectedView).parents(".big-numbers").addClass("active");
+						}
 						if(row.attr("id") == "all"){
 							$(".check.icon-check").removeClass("icon-check").addClass("icon-unchecked");
 							$('.d-table').find(".color").css("background-color", "transparent");
 							self.selectedApps = {};
 							self.selectedCount = 0;
 						}
-						else if(self.selectedApps["all"]){
-							$(".d-table #all .check.icon-check").removeClass("icon-check").addClass("icon-unchecked");
-							$('.d-table #all').find(".color").css("background-color", "transparent");
-							delete self.selectedApps["all"];
+						else{
+							if(self.selectedApps["all"]){
+								$(".d-table #all .check.icon-check").removeClass("icon-check").addClass("icon-unchecked");
+								$('.d-table #all').find(".color").css("background-color", "transparent");
+								delete self.selectedApps["all"];
+							}
+							self.selectedCount++;
 						}
-						self.selectedCount++;
 						row.find(".check").removeClass("icon-unchecked").addClass("icon-check");
 						self.selectedApps[row.attr("id")] = true;
 					}

diff --git a/frontend/express/public/javascripts/min/countly.lib.js b/frontend/express/public/javascripts/min/countly.lib.js
diff --git a/frontend/express/public/localization/dashboard/dashboard.properties b/frontend/express/public/localization/dashboard/dashboard.properties
@@ -269,4 +269,5 @@ allapps.total-sessions = Total Sessions
 allapps.total-users = Total Users
 allapps.new-users = New Users
 allapps.total-duration = Total Duration
-allapps.average-duration = Average Duration
+allapps.average-duration = Average Duration
+allapps.empty-graph = Select one or more applications to see the chart
diff --git a/frontend/express/public/stylesheets/main.css b/frontend/express/public/stylesheets/main.css
@@ -700,4 +700,5 @@ table.events-table { width:100%; padding:0; margin:0; }
 
 .allappview .widget-content .big-numbers .inner{height: 30px;}
 .allappview .widget-footer{border-radius: 0;}
+.allappview #empty-graph {position: absolute; text-align: center; font-size: 35px; width:100%; top:50%; margin-top: -20px; display: none;}
 .allapps div.color{ width: 10px; height: 20px; float: right;}
diff --git a/frontend/express/views/dashboard.html b/frontend/express/views/dashboard.html
@@ -518,6 +518,7 @@
 				</div>
 			</div>
 			<div class="widget-footer" style="height:220px; padding-top:20px; padding-bottom:10px; overflow:visible; box-shadow:none; position:relative;">
+				<div id="empty-graph" data-localize="allapps.empty-graph"></div>
 				<div id="dashboard-graph" class="graph" style="height:100%; margin-left:-10px;"></div>
 			</div>
 		</div>
@@ -1093,17 +1094,16 @@
 
 	<script language="javascript" type="text/javascript" src="https://www.google.com/jsapi"></script>
 
+	<% if (production) { %>
     <!-- PRODUCTION -->
-    <!---->
     <script language="javascript" type="text/javascript" src="/javascripts/min/countly.dom.js?<%= countlyVersion %>"></script>
     <script language="javascript" type="text/javascript" src="/javascripts/dom/tablesorter/jquery.tablesorter.min.js?<%= countlyVersion %>"></script>
     <script language="javascript" type="text/javascript" src="/javascripts/min/countly.utils.js?<%= countlyVersion %>"></script>
     <script language="javascript" type="text/javascript" src="/javascripts/min/countly.visualization.js?<%= countlyVersion %>"></script>
     <script language="javascript" type="text/javascript" src="/javascripts/countly/countly.config.js?<%= countlyVersion %>"></script>
     <script language="javascript" type="text/javascript" src="/javascripts/min/countly.lib.js?<%= countlyVersion %>"></script>
-    <!---->
+    <% } else { %>
     <!-- DEVELOPMENT -->
-    <!--
 	<script language="javascript" type="text/javascript" src="/javascripts/dom/jquery/jquery-1.8.3.min.js"></script>
 	<script language="javascript" type="text/javascript" src="/javascripts/utils/underscore-min.js"></script>
     <script language="javascript" type="text/javascript" src="/javascripts/utils/prefixfree.min.js"></script>
@@ -1151,7 +1151,7 @@
 	<script language="javascript" type="text/javascript" src="/javascripts/countly/countly.carrier.js"></script>
 	<script language="javascript" type="text/javascript" src="/javascripts/countly/countly.allapps.js"></script>
 	<script language="javascript" type="text/javascript" src="/javascripts/countly/countly.template.js"></script>
-    -->
+    <% } %>
     <% if (member.in_user_id && member.in_user_hash) { %>
     <!---->
     <script id="IntercomSettingsScriptTag">