Update change log and spec for wrt-plugins-tizen_0.2.84

[framework/web/wrt-plugins-tizen.git] / src / standards / Tizen / Calendar / JSCalendarItemProperties.cpp

diff --git a/src/standards/Tizen/Calendar/JSCalendarItemProperties.cpp b/src/standards/Tizen/Calendar/JSCalendarItemProperties.cpp
index 0121740..68ef14b 100755 (executable)
--- a/src/standards/Tizen/Calendar/JSCalendarItemProperties.cpp
+++ b/src/standards/Tizen/Calendar/JSCalendarItemProperties.cpp
@@ -461,7 +461,7 @@ JSValueRef JSCalendarItemProperties::getPropertyStartTime(JSContextRef context,
 
         LogInfo("start time before converted to TZDate: "<<event->getStartTime()<<", time zone: "<<event->getTimeZone());
         if (UNDEFINED_TIME==event->getStartTime()) {
-            return JSValueMakeNull(context);
+            return JSValueMakeUndefined(context);
         } else {
             return timeConverter.toJSValueRefTZDate((double)(event->getStartTime()*1000.0), event->getTimeZone());
         }
@@ -561,11 +561,11 @@ JSValueRef JSCalendarItemProperties::getPropertyCategories(JSContextRef context,
     LogDebug("entered");
     Try
     {
-        Converter converter(context);
+        CalendarConverter converter(context);
         CalendarEventPtr event = getPrivateObject(object);
-        CategoryListPtr categories = event->getCategories();
+        StringArrayPtr categories = event->getCategories();
         if (categories) {
-            return converter.toJSValueRef(*categories);
+            return converter.toJSValueRef(categories);
         }
     }
     Catch(Exception)
@@ -586,7 +586,7 @@ bool JSCalendarItemProperties::setPropertyCategories(JSContextRef context,
     {
         CalendarEventPtr event = getPrivateObject(object);
         CalendarConverter converter(context);
-        event->setCategories(converter.toCategories(value));
+               event->setCategories(converter.toStringArray(value));
         return true;
     }
     Catch(Exception)
@@ -658,19 +658,8 @@ JSValueRef JSCalendarItemProperties::getPropertyAlarms(JSContextRef context,
         if (NULL == jsResult) {
             ThrowMsg(NullPointerException, "Can not create array object.");
         }
-        for( unsigned int i=0; i<event->getAlarmsTick().size(); i++) {
-            EventAlarmPtr alarm(new EventAlarm());
-            TizenApis::Api::TimeUtil::DurationProperties duration;
-            duration.unit = TizenApis::Api::TimeUtil::MINUTES_UNIT;
-            duration.length = event->getAlarmsTick().at(i);
-            alarm->setDuration(duration); // Default unit is minute.
-            std::vector<CalendarEvent::EventAlarmType> methodVector;
-            methodVector.push_back(event->getAlarmsType().at(i)); // Only one alarm type is saved.
-            alarm->setMethods(methodVector);
-            alarm->setTimeZone(event->getTimeZone());
-            alarm->setDescription(event->getAlarmsDescription().at(i));
-
-            if (!JSSetArrayElement(context, jsResult, i, JSCalendarAlarm::createJSCalendarAlarm(context, alarm))) {
+        for( unsigned int i=0; i<event->getAlarms()->size(); i++) {
+            if (!JSSetArrayElement(context, jsResult, i, JSCalendarAlarm::createJSCalendarAlarm(context, event->getAlarms()->at(i)))) {
                ThrowMsg(UnknownException, "Can not insert value into array.");
             }
         }
@@ -697,46 +686,8 @@ bool JSCalendarItemProperties::setPropertyAlarms(JSContextRef context,
         CalendarConverter converter(context);
 
         EventAlarmListPtr alarms = converter.toVectorOfEventAlarmsFromReference(value);
-        std::vector<CalendarEvent::EventAlarmType> alarmsType;
-        std::vector<long> alarmsTick;
-        std::vector<std::string> alarmsDescription;
-
-        // Set the multiple alarms.
-        for( unsigned int i=0; i<alarms->size(); i++) {
-            EventAlarmPtr theAlarm = alarms->at(i);
-            alarmsType.push_back(theAlarm->getMethods().at(0));
-            alarmsDescription.push_back(theAlarm->getDescription());
-            if( 0 < theAlarm->getAbsoluteDate() ) {
-                alarmsTick.push_back(theAlarm->getAbsoluteDate()/60);
-            } else {
-                long tick;
-                long length = theAlarm->getDuration().length;
-                switch(theAlarm->getDuration().unit) {
-                case TizenApis::Api::TimeUtil::MSECS_UNIT:
-                    tick = length/(1000*60);
-                    break;
-                case TizenApis::Api::TimeUtil::SECONDS_UNIT:
-                    tick = length/60;
-                    break;
-                case TizenApis::Api::TimeUtil::MINUTES_UNIT:
-                    tick = length;
-                    break;
-                case TizenApis::Api::TimeUtil::HOURS_UNIT:
-                    tick = length*60;
-                    break;
-                case TizenApis::Api::TimeUtil::DAYS_UNIT:
-                    tick = length*60*24;
-                    break;
-                default:
-                    ThrowMsg(ConversionException, "Wrong alarm unit type.");
-                }
 
-                alarmsTick.push_back(tick);
-            }
-        }
-        event->setAlarmsType(alarmsType);
-        event->setAlarmsTick(alarmsTick);
-        event->setAlarmsDescription(alarmsDescription);
+        event->setAlarms(alarms);
         return true;
     }
     Catch(Exception)
@@ -1169,7 +1120,7 @@ JSValueRef JSCalendarItemProperties::getPropertyDueDate(JSContextRef context,
         }
 
         if (UNDEFINED_TIME==task->getEndTime()) {
-            return JSValueMakeNull(context);
+            return JSValueMakeUndefined(context);
         } else {
             TimeUtilConverter timeConverter(context);
             return timeConverter.toJSValueRefTZDate((double)(task->getEndTime()*1000.0), task->getTimeZone());
@@ -1241,7 +1192,7 @@ JSValueRef JSCalendarItemProperties::getPropertyCompletedDate(JSContextRef conte
         }
 
         if (UNDEFINED_TIME==task->getCompletedDate()) {
-            return JSValueMakeNull(context);
+            return JSValueMakeUndefined(context);
         } else {
             TimeUtilConverter timeConverter(context);
             return timeConverter.toJSValueRefTZDate((double)(task->getCompletedDate()*1000.0), task->getTimeZone());
@@ -1413,7 +1364,7 @@ JSValueRef JSCalendarItemProperties::getPropertyEndDate(JSContextRef context,
         }
 
         if (UNDEFINED_TIME==event->getEndTime()) {
-            return JSValueMakeNull(context);
+            return JSValueMakeUndefined(context);
         } else {
             TimeUtilConverter timeConverter(context);
             return timeConverter.toJSValueRefTZDate((double)(event->getEndTime()*1000.0), event->getTimeZone());