From ce8d3e68711dbc5c8afd9de70d4b3c552725054f Mon Sep 17 00:00:00 2001
From: pratu16x7 <pratu16x7@gmail.com>
Date: Tue, 29 Aug 2017 10:01:46 +0530
Subject: [PATCH] [user-progress] route post setup route

---
 frappe/desk/page/setup_wizard/setup_wizard.js |  8 +++----
 frappe/desk/user_progress.py                  |  6 +++--
 frappe/public/css/desk.css                    |  3 +++
 frappe/public/js/frappe/ui/toolbar/toolbar.js | 22 +++++++++++++------
 .../frappe/ui/toolbar/user_progress_dialog.js |  4 ++--
 frappe/public/less/desk.less                  |  3 +++
 6 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js
index dbea8f4ca1..7068b11077 100644
--- a/frappe/desk/page/setup_wizard/setup_wizard.js
+++ b/frappe/desk/page/setup_wizard/setup_wizard.js
@@ -154,13 +154,11 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides {
 				if(frappe.setup.welcome_page) {
 					localStorage.setItem("session_last_route", frappe.setup.welcome_page);
 				}
+				window.location = "/desk";
 				setTimeout(function() {
+					// frappe.ui.toolbar.clear_cache();
 					window.location = "/desk";
-					frappe.ui.toolbar.clear_cache();
-					// setTimeout(function() {
-					// 	frappe.frappe_toolbar.progress_dialog.show();
-					// }, 2000);
-				}, 2000);
+				}, 4000);
 			},
 			error: function() {
 				var d = frappe.msgprint(__("There were errors."));
diff --git a/frappe/desk/user_progress.py b/frappe/desk/user_progress.py
index 15877dc767..f62bb2a29d 100644
--- a/frappe/desk/user_progress.py
+++ b/frappe/desk/user_progress.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 
 import frappe
+from frappe.utils import cint
 
 @frappe.whitelist()
 def get_user_progress_slides():
@@ -11,8 +12,9 @@ def get_user_progress_slides():
 		Return user progress slides for the desktop (called via `get_user_progress_slides` hook)
 	'''
 	slides = []
-	for fn in frappe.get_hooks('get_user_progress_slides'):
-		slides += frappe.get_attr(fn)()
+	if cint(frappe.db.get_single_value('System Settings', 'setup_complete')):
+		for fn in frappe.get_hooks('get_user_progress_slides'):
+			slides += frappe.get_attr(fn)()
 
 	return slides
 
diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index 1dc4a96f37..a3124551f0 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -518,6 +518,7 @@ a.progress-small .progress {
   margin-bottom: 0;
 }
 a.progress-small .progress-bar {
+  transition: unset;
   background-color: #98d85b;
 }
 li.user-progress .progress-chart {
@@ -530,6 +531,7 @@ li.user-progress .progress {
   border: 1px solid #e5e7e9;
 }
 li.user-progress .progress-bar {
+  transition: unset;
   background-color: #98d85b;
 }
 /* on small screens, show only icons on top */
@@ -1219,5 +1221,6 @@ input[type="checkbox"]:checked:before {
   margin-bottom: 0px;
 }
 .user-progress-dialog .progress-bar {
+  transition: unset;
   background-color: #98d85b;
 }
diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js
index 315a675a76..84ce047288 100644
--- a/frappe/public/js/frappe/ui/toolbar/toolbar.js
+++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js
@@ -195,19 +195,27 @@ frappe.ui.toolbar.Toolbar = Class.extend({
 
 	setup_progress_dialog: function() {
 		var me = this;
+		$('.user-progress').hide();
 		frappe.call({
 			method: "frappe.desk.user_progress.get_user_progress_slides",
 			callback: function(r) {
 				if(r.message) {
 					let slides = r.message;
-					frappe.require("assets/frappe/js/frappe/ui/toolbar/user_progress_dialog.js", function() {
-						me.progress_dialog = new frappe.setup.UserProgressDialog({
-							slides: slides
+					if(slides.length) {
+						frappe.require("assets/frappe/js/frappe/ui/toolbar/user_progress_dialog.js", function() {
+							me.progress_dialog = new frappe.setup.UserProgressDialog({
+								slides: slides
+							});
+							$('.user-progress').show();
+							$('.user-progress .dropdown-toggle').on('click', () => {
+								me.progress_dialog.show();
+							});
+
+							setTimeout(function() {
+								me.progress_dialog.show();
+							}, 5000);
 						});
-						$('.user-progress .dropdown-toggle').on('click', () => {
-							me.progress_dialog.show();
-						});
-					});
+					}
 				}
 			},
 			freeze: false
diff --git a/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js b/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js
index e7c898fe7c..8dd3fd2620 100644
--- a/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js
+++ b/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js
@@ -170,7 +170,7 @@ frappe.setup.UserProgressSlide = class UserProgressSlide extends frappe.ui.Slide
 	primary_action() {
 		var me = this;
 		if(this.set_values()) {
-			this.$primary_btn.addClass('.disabled');
+			this.slides_footer.find('.make-btn').addClass('disabled');
 			frappe.call({
 				method: me.submit_method,
 				args: {args_data: me.values},
@@ -179,7 +179,7 @@ frappe.setup.UserProgressSlide = class UserProgressSlide extends frappe.ui.Slide
 					me.refresh();
 				},
 				onerror: function() {
-					me.$primary_btn.removeClass('.disabled');
+					me.slides_footer.find('.make-btn').removeClass('disabled');
 				},
 				freeze: true
 			});
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index ecc8b84965..f9100fd7e6 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -343,6 +343,7 @@ a.progress-small {
 	}
 
 	.progress-bar {
+		transition: unset;
 		background-color: #98d85b;
 	}
 }
@@ -360,6 +361,7 @@ li.user-progress {
 	}
 
 	.progress-bar {
+		transition: unset;
 		background-color: #98d85b;
 	}
 }
@@ -1191,6 +1193,7 @@ input[type="checkbox"] {
 		margin-bottom: 0px;
 	}
 	.progress-bar {
+		transition: unset;
 		background-color: #98d85b;
 	}
 }
\ No newline at end of file