[mapguide-commits] r6156 - trunk/MgDev/Web/src/mapadmin

[svn_mapguide at osgeo.org]

Author: liuar
Date: 2011-09-29 21:58:47 -0700 (Thu, 29 Sep 2011)
New Revision: 6156

Modified:
   trunk/MgDev/Web/src/mapadmin/performanceReport.php
   trunk/MgDev/Web/src/mapadmin/performanceReport_GetResult.php
   trunk/MgDev/Web/src/mapadmin/resizablepagecomponents.php
Log:
On behalf of Ted Yang.
fix the ticket 1768(part 5): http://trac.osgeo.org/mapguide/ticket/1768
	
This submission includes:
1. change the time format for the recent setting "h:m:s A"
2. remove the substr for the CoordinateSystem, for the API implementation has changed
3. change the format method for the scale, the valued should be formatted without a comma or decimal

Modified: trunk/MgDev/Web/src/mapadmin/performanceReport.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/performanceReport.php	2011-09-29 23:25:55 UTC (rev 6155)
+++ trunk/MgDev/Web/src/mapadmin/performanceReport.php	2011-09-30 04:58:47 UTC (rev 6156)
@@ -483,7 +483,7 @@
                         //if the scale is not match then show the warning message
                         if(ValidateScale(false))
                         {
-                            currentScaleValue = RemoveSpace( FormatNumber(currentScaleValue,2) );
+                            currentScaleValue = RemoveSpace( FormatNumber(currentScaleValue,0) );
 
                             if(currentScaleValue != scaleLastRun.value)
                             {
@@ -619,13 +619,13 @@
                         if(!result)
                         {
                             scaleWarnMsg.innerHTML = "Not a valid map scale.";
-                            scale.className="warnMsgStyle";
+                            scale.className = "warnMsgStyle";
                         }
                         else
                         {
                             if(needFormat)
                             {
-                                scale.value = FormatNumber(scaleValue,2);
+                                scale.value = FormatNumber(scaleValue,0);
                             }
 
                             scaleWarnMsg.innerHTML = "";
@@ -1076,21 +1076,35 @@
 
                 function FormatNumber(s, n)
                 {
-                   var n = n > 0 && n <= 20 ? n : 2;
+                   var n = n >= 0 && n <= 20 ? n : 2;
 
                    var s = parseFloat((s + "").replace(/[^\d\.-]/g, "")).toFixed(n) + "";
 
-                   var l = s.split(".")[0].split("").reverse() , r = s.split(".")[1];
+                   var l = s.split(".")[0].split("").reverse()
 
-                   var t = "";
+                   if(n > 0)
+                   {
+                       var r = s.split(".")[1];
+                       var t = "";
+                       var i=0;
+                       for(; i < l.length; i ++ )
+                       {
+                          t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? " " : "");
+                       }
 
-                   var i=0;
-                   for(; i < l.length; i ++ )
+                       return t.split("").reverse().join("") + "." + r;
+                   }
+                   else
                    {
-                      t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? " " : "");
+                       var t = "";
+                       var i=0;
+                       for(; i < l.length; i ++ )
+                       {
+                          t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? " " : "");
+                       }
+
+                       return t.split("").reverse().join("");
                    }
-
-                   return t.split("").reverse().join("") + "." + r;
                 }
 
                 function FormatCenterPoint(x,y,fractionDigits)
@@ -1821,7 +1835,7 @@
                         centerPoint.value = centerPointCookie.value;
 
                         var scaleInput = document.getElementById("txtScale");
-                        scaleInput.value = FormatNumber(scaleCookie.value,2);
+                        scaleInput.value = FormatNumber(scaleCookie.value,0);
 
                         var mapDefinitonSelector = document.getElementById("mapSelector_DO_NOT_PERSIST");
                         mapDefinitonSelector.value = Trim(mapIdCookie.value);
@@ -1880,7 +1894,7 @@
                         centerPoint.value = selectSetting[2];
 
                         var scaleInput = document.getElementById("txtScale");
-                        scaleInput.value = FormatNumber(selectSetting[3],2);
+                        scaleInput.value = FormatNumber(selectSetting[3],0);
                         
                         var tipDiv = document.getElementById("mapResourceNameTip");
                         tipDiv.innerHTML = mapDefinitonSelector.value;

Modified: trunk/MgDev/Web/src/mapadmin/performanceReport_GetResult.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/performanceReport_GetResult.php	2011-09-29 23:25:55 UTC (rev 6155)
+++ trunk/MgDev/Web/src/mapadmin/performanceReport_GetResult.php	2011-09-30 04:58:47 UTC (rev 6156)
@@ -343,9 +343,8 @@
                         <td style=" font-weight: bold;">Coordinate System:</td>
                         <td>
                             <span style="width:50px; overflow:hidden;">
-                            <?php
-                                //TODO: Waiting:Test on new build
-                                echo substr($mapProfileResult->MapProfileData->CoordinateSystem,0,25);
+                            <?php                         
+                                echo $mapProfileResult->MapProfileData->CoordinateSystem;
                             ?>
                             </span>
                         </td>

Modified: trunk/MgDev/Web/src/mapadmin/resizablepagecomponents.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/resizablepagecomponents.php	2011-09-29 23:25:55 UTC (rev 6155)
+++ trunk/MgDev/Web/src/mapadmin/resizablepagecomponents.php	2011-09-30 04:58:47 UTC (rev 6156)
@@ -2198,8 +2198,7 @@
                         number_format($layerProfileData->TotalRenderTime,2)."&nbsp;ms&nbsp;(".
                         $layerProfileData->GetRenderTimePercentage($sumofRenderTime)."%)&nbsp;</td>","\n";
                 echo "<td style='width:25%;'>".$layerProfileData->FeatureClass."</td>","\n";
-                //TODO: Waiting:Test on new build CoordinateSystem Length
-                echo "<td style='width:25%;'>".substr($layerProfileData->CoordinateSystem,0,25)."</td>","\n";
+                echo "<td style='width:25%;'>".$layerProfileData->CoordinateSystem."</td>","\n";
                 echo "<td style='width:15%;'>".$layerProfileData->LayerType."</td>","\n";
                 echo "</tr>","\n";
 
@@ -2358,7 +2357,7 @@
                 echo $dTime->format("M d,Y");
                 echo "</td>","\n";
                 echo "<td style='width:50%;text-align: right;'>","\n";
-                echo $dTime->format("H:m:s");
+                echo $dTime->format("h:m:s A");
                 echo "</td>","\n";
                 echo "</tr></table></td></tr></table>","\n";
             }