I re-attached the patch and sent two other fixes.

On Sun, Aug 17, 2014 at 6:59 PM, Miika Turkia <miika.tur...@gmail.com>
wrote:

> Following patch breaks the gas consumption graph:
>
> b06b0cd008a76b28f29f6f9fc649ed08e56e6207     HTML: Fix Fake precision
> value.
>
> miika
>
>
>
>
> On Sun, Aug 17, 2014 at 1:21 AM, Gehad Elrobey <gehadelro...@gmail.com>
> wrote:
>
>> I attached fixes to some minor bugs that Dirk has mentioned before.
>>
>> Regards,
>> Gehad
>>
>>
>> On Thu, Aug 14, 2014 at 8:10 AM, Gehad Elrobey <gehadelro...@gmail.com>
>> wrote:
>>
>>> Hi miika,
>>>
>>> I attached patches for the mentioned bug and other random fixes.
>>> Now I think the exports are quite stable.
>>>
>>> There is one remaining known bug in the keyboard arrows navigation
>>> between dives I will fix it and submit a patch later.
>>> I ll also work on some style enhancement.
>>>
>>> thanks.
>>>
>>>
>>> On Sun, Aug 10, 2014 at 6:22 PM, Miika Turkia <miika.tur...@gmail.com>
>>> wrote:
>>>
>>>> Thanks. I just fixed a few typos and will send versions with my SOB...
>>>> I'd be interested in testing the multilingual support, but to test it
>>>> properly requires the translations to be available.
>>>>
>>>> The bug I mentioned earlier about the missing trips seems to occur when
>>>> exporting selected dives. Even if I try to export two trips, the trips are
>>>> not shown, but all the exported dives are assigned to the "trip" *other*.
>>>>
>>>> miika
>>>>
>>>>
>>>> On Sun, Aug 10, 2014 at 12:41 PM, Gehad Elrobey <gehadelro...@gmail.com
>>>> > wrote:
>>>>
>>>>> Hi miika,
>>>>>
>>>>> Here are another four patches on the top of the previously sent
>>>>> patches.
>>>>> This is a try to make the HTML exports Multilingual I also fixed some
>>>>> bugs.
>>>>> I still need to update the user-manual if you find that these patches
>>>>> are good.
>>>>>
>>>>> Thanks.
>>>>>
>>>>>
>>>>> On Fri, Aug 8, 2014 at 6:22 PM, Miika Turkia <miika.tur...@gmail.com>
>>>>> wrote:
>>>>>
>>>>>> On Fri, Aug 8, 2014 at 5:32 PM, Gehad Elrobey <gehadelro...@gmail.com
>>>>>> > wrote:
>>>>>>
>>>>>>> I have attached some patches that improves the statistics table view
>>>>>>> and fix the cells layout.
>>>>>>>
>>>>>>> Thanks, I'll take a look later.
>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> On Mon, Aug 4, 2014 at 6:40 PM, Miika Turkia <miika.tur...@gmail.com
>>>>>>> > wrote:
>>>>>>>
>>>>>>>> Looking good, but some more improvements needed after a brief test:
>>>>>>>>
>>>>>>>> - When I export dives from one trip only, the trip mode sorting
>>>>>>>> shows all the exported dives under other.
>>>>>>>>
>>>>>>>
>>>>>>> I don't understand this, could you clarify that please?
>>>>>>>
>>>>>>
>>>>>> when I export one trip, and open the HTML, the trip mode does not
>>>>>> show the trip info. The attached screenshot will hopefully clarify.
>>>>>>
>>>>>> miika
>>>>>>
>>>>>
>>>>>
>>>>
>>>
>>
>
From 1cddaa4a2bff346603fe97428bb7d5b5f69f6beb Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelro...@gmail.com>
Date: Mon, 18 Aug 2014 00:58:55 +0300
Subject: [PATCH 3/3] HTML: time unit is in minutes not seconds.

Signed-off-by: Gehad elrobey <gehadelro...@gmail.com>
---
 theme/list_lib.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/list_lib.js b/theme/list_lib.js
index fc82dc8..84b1cb7 100644
--- a/theme/list_lib.js
+++ b/theme/list_lib.js
@@ -1144,7 +1144,7 @@ function canvas_draw()
 						 tickRenderer : $.jqplot.CanvasAxisTickRenderer,
 						 tickOptions : {
 							 showGridline : false,
-							 formatString : '%is'
+							 formatString : '%im'
 						 },
 						 label:'Time (min)'
 					 },
-- 
1.9.1

From bf6db1b59997d026c4a0df48db324bab8b7d0cfd Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelro...@gmail.com>
Date: Mon, 18 Aug 2014 00:30:17 +0300
Subject: [PATCH 2/3] HTML: Fix Fake precision value.

Signed-off-by: Gehad elrobey <gehadelro...@gmail.com>
---
 theme/list_lib.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/theme/list_lib.js b/theme/list_lib.js
index 5d8538b..fc82dc8 100644
--- a/theme/list_lib.js
+++ b/theme/list_lib.js
@@ -843,12 +843,12 @@ function get_cylinder_HTML(cylinder)
 	var cEPressure = cylinder.EPressure;
 
 	if (cSPressure === "--") {
-		cSPressure = mbar_to_bar(items[dive_id].samples[0][2]) + " bar";
+		cSPressure = Math.round(mbar_to_bar(items[dive_id].samples[0][2])).toFixed(1) + " bar";
 	}
 
 	if (cEPressure === "--") {
 		var nonZeroCEPressure = lastNonZero();
-		cEPressure = mbar_to_bar(nonZeroCEPressure) + " bar";
+		cEPressure = Math.round(mbar_to_bar(nonZeroCEPressure)).toFixed(1) + " bar";
 	}
 
 	return '<tr><td class="Cyl">' + cylinder.Type + '</td><td class="Cyl">' + cylinder.Size + '</td><td class="Cyl">' + cylinder.WPressure + '</td>' + '<td class="Cyl">' + cSPressure + '</td><td class="Cyl">' + cEPressure + '</td><td class="Cyl">' + cylinder.O2 + '</td></tr>';
@@ -1009,7 +1009,7 @@ function mm_to_meter(mm)
 
 function gram_to_km(gram)
 {
-	return gram / 1000;
+	return (gram / 1000).toFixed(1);
 }
 
 function ml_to_litre(ml)
-- 
1.9.1

From 04afa43c770ef53426ce261ee9f74321f16a39fb Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelro...@gmail.com>
Date: Sun, 17 Aug 2014 23:31:39 +0300
Subject: [PATCH 1/3] HTML: Update the user-manual with the new export
 settings.

Signed-off-by: Gehad elrobey <gehadelro...@gmail.com>
---
 Documentation/user-manual.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 35dbcd9..98ad599 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2003,8 +2003,8 @@ Export dialog (image *B* above).
 ** Subsurface Numbers: if this option is checked, the dive(s) are exported with the
 numbers associated with them in Subsurface, Otherwise the dive(s) will be numbered
 starting from 1.
-** Minimum Javascript: This will minimize the Javascript produced with the file,
-some functionality will be lost.
+** Export Yearly Statistics: if this option is checked, a yearly statistics table will
+be attached with the HTML exports.
 ** Export List only: a list of dives will only be exported and the detailed dive
 information will not be available.
 
-- 
1.9.1

_______________________________________________
subsurface mailing list
subsurface@hohndel.org
http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface

Reply via email to