[ExercisePlanner]update ExercisePlanner(tizen_2.1)

Change-Id: I669dd7a1666c60026745a1877c18fe9e4b2e744d

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36..4a0af40 100644 (file)
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -1,6 +1,6 @@
 Flora License
 
-Version 1.0, April, 2013
+Version 1.1, April, 2013
 
 http://floralicense.org/license/
 
@@ -119,17 +119,17 @@ Object form, provided that You meet the following conditions:
      Derivative Works; or, within a display generated by the Derivative Works,
      if and wherever such third-party notices normally appear.
      The contents of the NOTICE file are for informational purposes only
-     and do not modify the License.
-
-You may add Your own attribution notices within Derivative Works
-that You distribute, alongside or as an addendum to the NOTICE text
-from the Work, provided that such additional attribution notices
-cannot be construed as modifying the License. You may add Your own
-copyright statement to Your modifications and may provide additional or
-different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works
-as a whole, provided Your use, reproduction, and distribution of
-the Work otherwise complies with the conditions stated in this License.
+     and do not modify the License. You may add Your own attribution notices
+     within Derivative Works that You distribute, alongside or as an addendum
+     to the NOTICE text from the Work, provided that such additional attribution
+     notices cannot be construed as modifying the License. You may add Your own
+     copyright statement to Your modifications and may provide additional or
+     different license terms and conditions for use, reproduction, or
+     distribution of Your modifications, or for any such Derivative Works
+     as a whole, provided Your use, reproduction, and distribution of
+     the Work otherwise complies with the conditions stated in this License
+     and your own copyright statement or terms and conditions do not conflict
+     the conditions stated in the License including section 3.
 
 5. Submission of Contributions. Unless You explicitly state otherwise,
 any Contribution intentionally submitted for inclusion in the Work
@@ -192,7 +192,7 @@ identification within third-party archives.
 
    Copyright [yyyy] [name of copyright owner]
 
-   Licensed under the Flora License, Version 1.0 (the "License");
+   Licensed under the Flora License, Version 1.1 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 

diff --git a/NOTICE b/NOTICE
index 85044e4..092bc04 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.
-Please, see the LICENSE.Flora file for Flora License terms and conditions.
+Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Flora License, Version 1.1
+Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions.
 

diff --git a/js/UI.js b/js/UI.js
index b25bb2e..41cab09 100644 (file)
--- a/js/UI.js
+++ b/js/UI.js
@@ -128,10 +128,10 @@ function UI() {
 
                if (this.app.editTimeRange(nr) >= 0) {
                        $('#updateTime').val('modify');
-                       $('#rangesOfTimes h1').text('Edit Time')
+                       $('#rangesOfTimes h1').text('Edit Time');
                } else {
                        $('#updateTime').val('add');
-                       $('#rangesOfTimes h1').text('Add Time')
+                       $('#rangesOfTimes h1').text('Add Time');
                }
 
                // change page to form;
@@ -420,6 +420,13 @@ function UI() {
                this.graphSchedule = new GraphSchedule({
                        onSuccess : this.onGraphSchedule.bind(this, onInitEnd)
                });
+
+               this.fixContentHeight();
+       };
+
+       UI.prototype.fixContentHeight = function () {
+               var contentHeight = screen.availHeight - $('div[data-role="header"]').outerHeight() - $('div[data-role="footer"]').outerHeight();
+               $('div[data-role="content"]').css('height', contentHeight);
        };
 
 }());

diff --git a/js/app.timeRange.js b/js/app.timeRange.js
index 374fde6..cd418d9 100644 (file)
--- a/js/app.timeRange.js
+++ b/js/app.timeRange.js
@@ -356,8 +356,8 @@
                len = periods.length;
                for (i = 0; i < len; i += 1) {
                        for (j = periods[i].start; j < periods[i].start + periods[i].duration; j += 1) {
-                               result.workday[j] = true;
-                               result.weekend[j] = true;
+                               result.workday[j % 24] = true;
+                               result.weekend[j % 24] = true;
                        }
                }
 
@@ -366,7 +366,7 @@
                len = periods.length;
                for (i = 0; i < len; i += 1) {
                        for (j = periods[i].start; j < periods[i].start + periods[i].duration; j += 1) {
-                               result.workday[j] = true;
+                               result.workday[j % 24] = true;
                        }
                }
 
@@ -375,7 +375,7 @@
                len = periods.length;
                for (i = 0; i < len; i += 1) {
                        for (j = periods[i].start; j < periods[i].start + periods[i].duration; j += 1) {
-                               result.weekend[j] = true;
+                               result.weekend[j % 24] = true;
                        }
                }
                return result;

diff --git a/js/main.js b/js/main.js
index c3d8a85..f928da4 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -1,7 +1,7 @@
 /*
- *      Copyright 2012  Samsung Electronics Co., Ltd
+ *      Copyright 2013  Samsung Electronics Co., Ltd
  *
- *      Licensed under the Flora License, Version 1.0 (the "License");
+ *      Licensed under the Flora License, Version 1.1 (the "License");
  *      you may not use this file except in compliance with the License.
  *      You may obtain a copy of the License at
  *