update pickup.js

abvw/js/pickup/pickup.js

@@ -7,6 +7,7 @@ var PICKUP = {};
 PICKUP.newReportList;
 PICKUP.newReportList;
 PICKUP.continousWorkReport;
 PICKUP.continousWorkReport;
 PICKUP.reportWithWarning;
 PICKUP.reportWithWarning;
+PICKUP.pickupDefault = "newReport";
 PICKUP.pickupActive = "newReport";
 PICKUP.pickupActive = "newReport";
 
 
 PICKUP.countNewReportList = 0;
 PICKUP.countNewReportList = 0;
@@ -113,8 +114,8 @@ PICKUP.getReportWithWarningsListData = function (callback) {
  */
  */
 PICKUP.init = function() {
 PICKUP.init = function() {
 	console.log("PICKUP.init");
 	console.log("PICKUP.init");
-	TEMPLATE.loadHearder();
-	TEMPLATE.loadConfirmModal();
+	TEMPLATE.loadHearder("#includedHeader");
+    TEMPLATE.loadConfirmModal("#includedConfirmModal");
 	PICKUP.initSettingActivePickup();
 	PICKUP.initSettingActivePickup();
 	PICKUP.settingPickup();
 	PICKUP.settingPickup();
 }
 }
@@ -148,6 +149,10 @@ PICKUP.settingPickup = function() {
  */
  */
 PICKUP.initSettingActivePickup = function() {
 PICKUP.initSettingActivePickup = function() {
 	var urlParam = COMMON.getUrlParameter();
 	var urlParam = COMMON.getUrlParameter();
+	if(urlParam.pickupActive == undefined || urlParam.pickupActive == '' )
+	{
+		urlParam.pickupActive = PICKUP.pickupDefault;
+	}
 	PICKUP.pickupActive = urlParam.pickupActive;
 	PICKUP.pickupActive = urlParam.pickupActive;
 	PICKUP.settingActivePickup(PICKUP.pickupActive);
 	PICKUP.settingActivePickup(PICKUP.pickupActive);
 }
 }