From b5eed0d2fbd0cd4809452af5fc637423f1c8a135 Mon Sep 17 00:00:00 2001
From: Cobub <cobub.open@gmail.com>
Date: Mon, 3 Dec 2012 14:11:50 +0800
Subject: [PATCH] v0.3.1

fix some display error.
---
 web/application/controllers/manage/event.php  |  16 +-
 web/application/models/event/userevent.php    |   9 +
 .../views/conversionrate/modify.php           |   4 +-
 .../views/events/eventchartdetailview.php     |   3 +
 web/application/views/manage/funnel.php       |   7 +-
 .../views/widgets/channelmarket.php           |   2 +-
 web/application/views/widgets/conversions.php |   8 +-
 web/application/views/widgets/userremain.php  | 178 ++++++++++++------
 web/application/views/widgets/versionview.php |   2 +-
 9 files changed, 155 insertions(+), 74 deletions(-)

diff --git a/web/application/controllers/manage/event.php b/web/application/controllers/manage/event.php
index 78270f2e..7ec71e70 100644
--- a/web/application/controllers/manage/event.php
+++ b/web/application/controllers/manage/event.php
@@ -65,12 +65,18 @@ function modifyEvent()
 	    $productId = $product->id;
 	    $eventId  = $_POST['eventId'];
 	    $eventName = $_POST['eventName'];
-	    $isUnique=$this->event->isUnique($productId,$eventId);
-	    if(!empty($isUnique)){
-	    	echo false;
-	    }else{
+	    $isUniqueid=$this->event->isUnique($productId,$eventId);
+	    if(!empty($isUniqueid)){
+	    	foreach ($isUniqueid as $row){
+	    		$currentid=$row->event_id;
+	    	}
+	    	if($currentid!=$id){
+	    		echo false;
+	    		return;
+	    	}
+	    }
 	    $this->event->modifyEvent($id,$eventId,$eventName);
-	    echo true;}
+	    echo true;
 	}
 	
 	function stopEvent($id)
diff --git a/web/application/models/event/userevent.php b/web/application/models/event/userevent.php
index e16eacf4..070514a0 100644
--- a/web/application/models/event/userevent.php
+++ b/web/application/models/event/userevent.php
@@ -137,6 +137,15 @@ function isUnique($productId,$event_id){
 		
 	}
 	
+	function isUniqueData($productId,$event_id,$event_name){
+		$this->db->from('event_defination');
+		$this->db->where('product_id',$productId);
+		$this->db->where('event_identifier',$event_id);
+		$this->db->where('event_name',$event_name);
+		$r = $this->db->get();
+		return $r->result();
+	}
+	
 	function addEvent($event_id,$event_name)
 	{
 	   $userId = $this->common->getUserId();
diff --git a/web/application/views/conversionrate/modify.php b/web/application/views/conversionrate/modify.php
index fe33c6ff..79a47a67 100644
--- a/web/application/views/conversionrate/modify.php
+++ b/web/application/views/conversionrate/modify.php
@@ -18,7 +18,7 @@
 }
 		</style>
 						<fieldset>
-							<label><?php echo lang('v_rpt_re_funnelModifyfunnel');?></label> <input type="text" id="funnel_name"
+							<label><?php echo lang('v_rpt_re_funnelName');?></label> <input type="text" id="funnel_name"
 								name="funnel_name"
 								value="<?php if(isset($steplist)){echo $steplist->first_row()->targetname;}?>" />
 							<label><?php echo lang('v_rpt_re_unitprice');?></label> <input
@@ -30,7 +30,7 @@
 							<label>
 							<a
 								href="javascript:rmField(<?php echo $step->sequence?>,<?php echo $step->eventid?>,<?php echo $step->tid?>);"
-								title="Remove"><img src="<?php echo base_url()?>assets/images/jian.png" style="border:0"/></a><?php echo lang('v_rpt_re_funnelStepadd');?><?php  echo $step->sequence?></label>
+								title="Remove"><img src="<?php echo base_url()?>assets/images/jian.png" style="border:0"/></a><?php echo lang('v_rpt_re_funnelStep');?><?php  echo $step->sequence?></label>
 							 <input type="text" readonly="readonly" value="<?php echo $step->event_name?>" param="<?php echo $step->eventid?>" name="event_id"/>
 							 <label><?php echo lang('v_rpt_re_funnelStepname');?></label> <input type="text" name="stepname"
 								step="<?php echo $step->sequence?>"
diff --git a/web/application/views/events/eventchartdetailview.php b/web/application/views/events/eventchartdetailview.php
index a135d68e..7c7a7a91 100644
--- a/web/application/views/events/eventchartdetailview.php
+++ b/web/application/views/events/eventchartdetailview.php
@@ -156,6 +156,9 @@
                         }
                     }
             },
+            credits:{
+                enabled:false
+            },
             legend:{
                 labelFormatter: function() {
                 	return this.name
diff --git a/web/application/views/manage/funnel.php b/web/application/views/manage/funnel.php
index 285f1bdd..061a7f72 100644
--- a/web/application/views/manage/funnel.php
+++ b/web/application/views/manage/funnel.php
@@ -39,7 +39,7 @@
 									if(($e1_c==0)||($e2_c==0)){
 										echo 0;
 									}else{
-										echo round(($e2_c/$e1_c)*100,2);
+										echo round(($e2_c/$e1_c)*100,1);
 									}
 								}?>%</td>
 							<td><a
@@ -180,11 +180,12 @@ function checkContent(){
 		if(!con){return false;}
 			var exist_events_hash = {};
 			 $.each($('fieldset[var=setp] select option:selected'), function(i,e){
-				    var event = $(e).text();
+				    var event = $(e).val();
+				    var eventName=$(e).text();
 				    if( !exist_events_hash.hasOwnProperty(event) ){
 				      exist_events_hash[event] = true;
 				    }else{
-				      alert('<?php echo lang('v_rpt_re_funnelmsgNotrepeatevent');?>: '+ event);
+				      alert('<?php echo lang('v_rpt_re_funnelmsgNotrepeatevent');?>:'+eventName);
 					con=false;
 				    }});
 		if(!con){return false;}
diff --git a/web/application/views/widgets/channelmarket.php b/web/application/views/widgets/channelmarket.php
index 7ea6311b..c51b4186 100644
--- a/web/application/views/widgets/channelmarket.php
+++ b/web/application/views/widgets/channelmarket.php
@@ -60,7 +60,7 @@
 var category=[];
 var tooltipmarkevent=[];
 var tooltipdata=new Array(new Array(),new Array());
-var tooltipname=new Array(new Array(),new Array());
+var tooltipname=[];
 var colors=['#4572A7', '#AA4643', '#89A54E', '#80699B', '#3D96AE', '#DB843D', '#92A8CD', 
              '#A47D7C', '#B5CA92','#4572A7', '#AA4643', '#89A54E', '#80699B', '#3D96AE', 
              '#DB843D', '#92A8CD', '#A47D7C', '#B5CA92'];
diff --git a/web/application/views/widgets/conversions.php b/web/application/views/widgets/conversions.php
index e57e73d9..523960ef 100644
--- a/web/application/views/widgets/conversions.php
+++ b/web/application/views/widgets/conversions.php
@@ -120,13 +120,15 @@
 				            var length=this.points.length;
 							for(i=0;i<length;i++){
 								var point=this.points[i];
-								var unitprice=point.total==null?0:point.total;
-								msg+='<?php echo lang('v_rpt_re_funnelTarget');?>:'+point.series.name +','+'<?php echo lang("v_rpt_re_count");?>'+':'+point.y+","+"<?php echo lang('v_rpt_re_unitprice');?>:"+unitprice+'<br/>';
+								if(!markEventIndex.content(point.series.index)){
+									var unitprice=point.total==null?0:point.total;
+									msg+='<?php echo lang('v_rpt_re_funnelTarget');?>:'+point.series.name +','+'<?php echo lang("v_rpt_re_count");?>'+':'+point.y+","+"<?php echo lang('v_rpt_re_unitprice');?>:"+unitprice+'<br/>';
+									}
 								}
 				            }
 		            }else{//mean compare
 		            	var length=this.points.length;
-		            	
+		            	msg+='<?php echo lang("g_date")?>:'+this.x+'<br/>';
 						for(i=0;i<length;i++){
 							var point=this.points[i];
 							msg+='<?php echo lang('v_rpt_re_funnelTarget');?>:'+point.series.name+'<br/>';
diff --git a/web/application/views/widgets/userremain.php b/web/application/views/widgets/userremain.php
index aaac9a7c..b155d909 100644
--- a/web/application/views/widgets/userremain.php
+++ b/web/application/views/widgets/userremain.php
@@ -91,6 +91,9 @@
 		<div class="spacer"></div>
 </section>
 <script type="text/javascript">
+var weekuserdata;
+var monthuserdata;
+			
 var color=["","#EDFFFF","#FFFEED","#EDEDED"];			
 			
 //When page loads...
@@ -108,6 +111,114 @@
 	return false;
 });
 </script>
+
+<script type="text/javascript">
+function pageselectweekCallback(page_index, jq){			
+	page_index = arguments[0] ? arguments[0] : "0";
+	jq = arguments[1] ? arguments[1] : "0";   
+	var index = page_index*7;
+	var pagenum = 7;	
+	var weektr = "";	
+	for(i=0;i<pagenum && (index+i)<weekuserdata.length ;i++)
+	{ 
+		var start = weekuserdata[i+index].startdate;
+		var end   = weekuserdata[i+index].enddate;
+		var showtime = start+"~"+end;
+		weektr = weektr+"<tr><td>";
+		weektr = weektr + showtime;
+		weektr = weektr + "</td><td>";
+		weektr = weektr + weekuserdata[i+index].usercount;			
+		weektr = weektr + "</td><td>";
+		weektr = weektr + weekuserdata[i+index].week1;
+		weektr = weektr + "</td><td>";
+		weektr = weektr + weekuserdata[i+index].week2;
+		weektr = weektr + "</td><td>";
+		weektr = weektr + weekuserdata[i+index].week3;
+		weektr = weektr + "</td><td>";
+		weektr = weektr + weekuserdata[i+index].week4;
+		weektr = weektr + "</td><td>";
+		weektr = weektr + weekuserdata[i+index].week5;
+		weektr = weektr + "</td><td>";
+		weektr = weektr + weekuserdata[i+index].week6;
+		weektr = weektr + "</td><td>";
+		weektr = weektr + weekuserdata[i+index].week7;
+		weektr = weektr + "</td><td>";
+		weektr = weektr + weekuserdata[i+index].week8;					
+		weektr = weektr + "</td></tr>";
+	}
+	$('#weekdata').html(weektr);	
+   //document.getElementById('content').innerHTML = msg;				
+   return false;
+ }
+
+function pageselectmonthCallback(page_index, jq){			
+	page_index = arguments[0] ? arguments[0] : "0";
+	jq = arguments[1] ? arguments[1] : "0";   
+	var index = page_index*7;
+	var pagenum = 7;	
+	var monthtr = "";
+	for(j=0;j<pagenum && (index+j)<monthuserdata.length ;j++)
+	{
+		var start = monthuserdata[j+index].startdate;				
+		var end   = monthuserdata[j+index].enddate;
+		var showtime = start+"~"+end;
+		monthtr = monthtr+"<tr><td>";
+		monthtr = monthtr + showtime;
+		monthtr = monthtr + "</td><td>";
+		monthtr = monthtr + monthuserdata[j+index].usercount;			
+		monthtr = monthtr + "</td><td>";
+		monthtr = monthtr + monthuserdata[j+index].month1;
+		monthtr = monthtr + "</td><td>";
+		monthtr = monthtr + monthuserdata[j+index].month2;
+		monthtr = monthtr + "</td><td>";
+		monthtr = monthtr + monthuserdata[j+index].month3;
+		monthtr = monthtr + "</td><td>";
+		monthtr = monthtr + monthuserdata[j+index].month4;
+		monthtr = monthtr + "</td><td>";
+		monthtr = monthtr + monthuserdata[j+index].month5;
+		monthtr = monthtr + "</td><td>";
+		monthtr = monthtr + monthuserdata[j+index].month6;
+		monthtr = monthtr + "</td><td>";
+		monthtr = monthtr + monthuserdata[j+index].month7;
+		monthtr = monthtr + "</td><td>";
+		monthtr = monthtr + monthuserdata[j+index].month8;					
+		monthtr = monthtr + "</td></tr>";
+	}
+	$('#monthdata').html(monthtr);
+   //document.getElementById('content').innerHTML = msg;				
+   return false;
+ }         
+/** 
+* Callback function for the AJAX content loader.
+ */
+function weekinitPagination() {
+  var num_entries = (weekuserdata.length)/7;
+  // Create pagination element
+  $("#weekpage").pagination(num_entries, {
+     num_edge_entries: 2,
+     prev_text: '<?php echo  lang('g_previousPage')?>',
+     next_text: '<?php echo  lang('g_nextPage')?>',           
+     num_display_entries: 4,
+     callback: pageselectweekCallback,
+     items_per_page:1               
+           });
+ }
+
+function monthinitPagination() {
+	  var num_entries = (monthuserdata.length)/7;
+	  // Create pagination element
+	  $("#monthpage").pagination(num_entries, {
+	     num_edge_entries: 2,
+	     prev_text: '<?php echo  lang('g_previousPage')?>',
+	     next_text: '<?php echo  lang('g_nextPage')?>',           
+	     num_display_entries: 4,
+	     callback: pageselectmonthCallback,
+	     items_per_page:1               
+	           });
+	 }
+      
+</script>
+
 <script type="text/javascript">
 var type=document.getElementById('selectversion').value;
 $(document).ready(function() {	
@@ -182,67 +293,16 @@ function renderUserData(myurl)
 			}
 		}
 			else{//content compare data
-				var weekuserdata=eval(weekobj);
-				var monthuserdata=eval(monthobj);
-				for(i=0;i<weekuserdata.length;i++)
-				{
-					var start = weekuserdata[i].startdate;
-					var end   = weekuserdata[i].enddate;
-					var showtime = start+"~"+end;
-					weektr = weektr+"<tr><td>";
-					weektr = weektr + showtime;
-					weektr = weektr + "</td><td>";
-					weektr = weektr + weekuserdata[i].usercount;			
-					weektr = weektr + "</td><td>";
-					weektr = weektr + weekuserdata[i].week1;
-					weektr = weektr + "</td><td>";
-					weektr = weektr + weekuserdata[i].week2;
-					weektr = weektr + "</td><td>";
-					weektr = weektr + weekuserdata[i].week3;
-					weektr = weektr + "</td><td>";
-					weektr = weektr + weekuserdata[i].week4;
-					weektr = weektr + "</td><td>";
-					weektr = weektr + weekuserdata[i].week5;
-					weektr = weektr + "</td><td>";
-					weektr = weektr + weekuserdata[i].week6;
-					weektr = weektr + "</td><td>";
-					weektr = weektr + weekuserdata[i].week7;
-					weektr = weektr + "</td><td>";
-					weektr = weektr + weekuserdata[i].week8;					
-					weektr = weektr + "</td></tr>";
-				}	
-				for(j=0;j<monthuserdata.length;j++)	
-				{
-					var start = monthuserdata[j].startdate;				
-					var end   = monthuserdata[j].enddate;
-					var showtime = start+"~"+end;
-					monthtr = monthtr+"<tr><td>";
-					monthtr = monthtr + showtime;
-					monthtr = monthtr + "</td><td>";
-					monthtr = monthtr + monthuserdata[j].usercount;			
-					monthtr = monthtr + "</td><td>";
-					monthtr = monthtr + monthuserdata[j].month1;
-					monthtr = monthtr + "</td><td>";
-					monthtr = monthtr + monthuserdata[j].month2;
-					monthtr = monthtr + "</td><td>";
-					monthtr = monthtr + monthuserdata[j].month3;
-					monthtr = monthtr + "</td><td>";
-					monthtr = monthtr + monthuserdata[j].month4;
-					monthtr = monthtr + "</td><td>";
-					monthtr = monthtr + monthuserdata[j].month5;
-					monthtr = monthtr + "</td><td>";
-					monthtr = monthtr + monthuserdata[j].month6;
-					monthtr = monthtr + "</td><td>";
-					monthtr = monthtr + monthuserdata[j].month7;
-					monthtr = monthtr + "</td><td>";
-					monthtr = monthtr + monthuserdata[j].month8;					
-					monthtr = monthtr + "</td></tr>";
-				}
+				weekuserdata=eval(weekobj);
+				monthuserdata=eval(monthobj);
+				weekinitPagination();
+				monthinitPagination() ;
+				pageselectweekCallback(0,null);
+				pageselectmonthCallback(0,null);
 				chart_canvas.unblock();	
-				//document.getElementById('weekdata').innerHTML=weektr;	
-				$('#weekdata').html(weektr);	
+				//document.getElementById('weekdata').innerHTML=weektr;					
 				//document.getElementById('monthdata').innerHTML = monthtr;
-				$('#monthdata').html(monthtr);
+			
 			}
 		return false;
 		});  
diff --git a/web/application/views/widgets/versionview.php b/web/application/views/widgets/versionview.php
index 5db5320e..05710869 100644
--- a/web/application/views/widgets/versionview.php
+++ b/web/application/views/widgets/versionview.php
@@ -52,7 +52,7 @@
 var category=[];
 var tooltipmarkevent=[];
 var tooltipdata=new Array(new Array(),new Array());
-var tooltipname=new Array(new Array(),new Array());
+var tooltipname=[];
 var colors=['#4572A7', '#AA4643', '#89A54E', '#80699B', '#3D96AE', '#DB843D', '#92A8CD', 
              '#A47D7C', '#B5CA92','#4572A7', '#AA4643', '#89A54E', '#80699B', '#3D96AE', 
              '#DB843D', '#92A8CD', '#A47D7C', '#B5CA92'];