Fix for N_SE-40943 N_SE-40950

Change-Id: Ic8204427ecfa76627ce15212111a7f5191174e7f
Signed-off-by: Amith Kumar Mahale <amith.m@samsung.com>

diff --git a/inc/ClTypes.h b/inc/ClTypes.h
index 7bc4d84..1a87502 100644 (file)
--- a/inc/ClTypes.h
+++ b/inc/ClTypes.h
@@ -175,6 +175,8 @@ extern const wchar_t* IDS_POPUP_DELETE_MULTIPLE_REPEATED_EVENT;
 extern const wchar_t* IDS_POPUP_EDIT_EVENT_QUESTION;
 extern const wchar_t* IDS_IMGE_POP_TEXT_TOO_LONG;
 extern const wchar_t* IDS_CLD_OPT_AGENDA;
+extern const wchar_t* IDS_BR_POP_PD_ITEMS_SELECTED;
+extern const wchar_t* IDS_BR_BODY_PD_ITEM_SELECTED;
 
 //bitmap ID
 extern const wchar_t* IDB_SPIN_LEFT;

diff --git a/src/ClEventDeleterForm.cpp b/src/ClEventDeleterForm.cpp
index e603f0c..1bc9667 100755 (executable)
--- a/src/ClEventDeleterForm.cpp
+++ b/src/ClEventDeleterForm.cpp
@@ -916,7 +916,7 @@ EventDeleterForm::UpdateSelectedLabel(void)
        {
                GetFooter()->SetItemEnabled(0, true);
 
-               String labelString = ResourceManager::GetString(itemCount > 1 ? IDS_COM_BODY_PD_SELECTED : IDS_COM_BODY_PD_1_SELECTED);
+               String labelString = ResourceManager::GetString(itemCount > 1 ? IDS_BR_POP_PD_ITEMS_SELECTED : IDS_BR_BODY_PD_ITEM_SELECTED);
                labelString.Format(labelString.GetLength() + Integer::ToString(itemCount).GetLength(), labelString.GetPointer(), itemCount);
                __pLabel->SetText(labelString);
                __pLabel->SetSize(GetClientAreaBounds().width, H_COUNT_LABEL);

diff --git a/src/ClReminderForm.cpp b/src/ClReminderForm.cpp
index 3263fc0..1d58f5d 100644 (file)
--- a/src/ClReminderForm.cpp
+++ b/src/ClReminderForm.cpp
@@ -145,6 +145,13 @@ ReminderForm::OnFormBackRequested(Form& source)
 
        if (__reminderType != REMINDER_TYPE_OFF)
        {
+               //Before sending the reminder we need to check if the time offset is 0
+               //if it is 0 we need to set the reminder as on-time
+               if(__pReminder->GetTimeOffset() == 0)
+               {
+                       //set the reminder as on-time
+                       __pReminder->SetTimeOffset(REMINDER_TIME_UNIT_MINUTE, 0);
+               }
                pList->Add(__pReminder);
                __pReminder = null;
        }

diff --git a/src/ClTypes.cpp b/src/ClTypes.cpp
index 5a3f954..67aead0 100644 (file)
--- a/src/ClTypes.cpp
+++ b/src/ClTypes.cpp
@@ -174,6 +174,8 @@ const wchar_t* IDS_POPUP_DELETE_MULTIPLE_REPEATED_EVENT = L"IDS_POPUP_DELETE_MUL
 const wchar_t* IDS_POPUP_EDIT_EVENT_QUESTION = L"IDS_POPUP_EDIT_EVENT_QUESTION";
 const wchar_t* IDS_IMGE_POP_TEXT_TOO_LONG = L"IDS_IMGE_POP_TEXT_TOO_LONG";
 const wchar_t* IDS_CLD_OPT_AGENDA = L"IDS_CLD_OPT_AGENDA";
+const wchar_t* IDS_BR_POP_PD_ITEMS_SELECTED = L"IDS_BR_POP_PD_ITEMS_SELECTED";
+const wchar_t* IDS_BR_BODY_PD_ITEM_SELECTED = L"IDS_BR_BODY_PD_ITEM_SELECTED";
 
 //bitmap ID
 const wchar_t* IDB_ALL_DAY_EVENT_LIST_EXPAND_CLOSED = L"P01_month view_expanded_down.png";