NABI_SE Issue fix 56734 56714

Change-Id: I0a2a64e8b5965c2946d8153f884ff7af81a6c4f6

diff --git a/inc/CtTypes.h b/inc/CtTypes.h
index 9810a93..8feb46a 100644 (file)
--- a/inc/CtTypes.h
+++ b/inc/CtTypes.h
@@ -260,5 +260,6 @@ extern const int FONT_SIZE_DELETE_CONFIRM;
 extern const int FONT_SIZE_DELETE_BUTTON;
 
 extern const int BIRTHDAY_MIN_YEAR_DIFF;
+extern const int BIRTHDAY_MAX_YEAR_DIFF;
 
 #endif /* _CT_TYPES_H_ */

diff --git a/src/CtContactEditorForm.cpp b/src/CtContactEditorForm.cpp
index b82086e..5ba7f83 100644 (file)
--- a/src/CtContactEditorForm.cpp
+++ b/src/CtContactEditorForm.cpp
@@ -535,32 +535,14 @@ ContactEditorForm::OnActionPerformed(const Tizen::Ui::Control& source, int actio
                {
                        result r = E_SUCCESS;
 
-                       DateTime changedDate;
-                       DateTime currentDate;
-                       SystemTime::GetCurrentTime(currentDate);
-
-                       __pPresentationModel->GetBirthday(changedDate);
-
-                       if (changedDate.CompareTo(currentDate) > 0)
+                       r = SaveContactData();
+                       if (r != E_SUCCESS)
                        {
-                               int modalResult;
-                               MessageBox invalidBirthYear;
-                               invalidBirthYear.Construct(L"", ResourceManager::GetString(L"IDS_SAPPS_POP_INVALID_DATE_OF_BIRTH"), MSGBOX_STYLE_OK, MESSAGE_BOX_TIMEOUT_MS);
-                               invalidBirthYear.ShowAndWait(modalResult);
-                               __pPresentationModel->SetBirthday(currentDate);
-                               __pTableView->RefreshItem(TABLE_VIEW_BIRTHDAY_FIELD_INDEX, 0, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+                               return;
                        }
-                       else
-                       {
-                               r = SaveContactData();
-                               if (r != E_SUCCESS)
-                               {
-                                       return;
-                               }
-                               SetFocus();
+                       SetFocus();
 
-                               __isSaved = true;
-                       }
+                       __isSaved = true;
                }
                break;
        case IDA_BUTTON_THUMBNAIL_ADD:
@@ -1575,22 +1557,11 @@ ContactEditorForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls
                break;
        case TABLE_VIEW_BIRTHDAY_FIELD_INDEX:
                {
-                       int min;
-                       int max;
-                       DateTime birthdayDate;
                        EditDate* pBirthday = static_cast<EditDate *>(pItem->GetControl(1));
-
                        if (pBirthday == null)
                        {
                                return;
                        }
-
-                       __pPresentationModel->GetBirthday(birthdayDate);
-
-                       pBirthday->GetYearRange(min, max);
-                       max = birthdayDate.GetYear();
-                       pBirthday->SetYearRange(max - BIRTHDAY_MIN_YEAR_DIFF, max);
-                       pBirthday->SetDate(birthdayDate);
                        pBirthday->Invalidate(false);
                }
                break;
@@ -2256,7 +2227,7 @@ ContactEditorForm::GetBirthdayField(int itemWidth)
        int max;
        pBirthday->GetYearRange(min, max);
        max = currentDate.GetYear();
-       pBirthday->SetYearRange(max - BIRTHDAY_MIN_YEAR_DIFF, max);
+       pBirthday->SetYearRange(max - BIRTHDAY_MIN_YEAR_DIFF, max + BIRTHDAY_MAX_YEAR_DIFF);
 
        if (birthdayDate.GetYear() < (currentDate.GetYear() - BIRTHDAY_MIN_YEAR_DIFF))
        {
@@ -4344,11 +4315,7 @@ ContactEditorForm::OnSettingChanged(Tizen::Base::String &key)
                DateTime currentDate;
                Tizen::System::SystemTime::GetCurrentTime(currentDate);
 
-               if(bday > currentDate)
-               {
-                       __pPresentationModel->SetBirthday(currentDate);
-                       __pTableView->RefreshItem(TABLE_VIEW_BIRTHDAY_FIELD_INDEX, 0, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-               }
+               __pTableView->RefreshItem(TABLE_VIEW_BIRTHDAY_FIELD_INDEX, 0, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
        }
 }
 

diff --git a/src/CtGroupSelectorForm.cpp b/src/CtGroupSelectorForm.cpp
index 8c91ddd..57f3d92 100644 (file)
--- a/src/CtGroupSelectorForm.cpp
+++ b/src/CtGroupSelectorForm.cpp
@@ -430,6 +430,33 @@ GroupSelectorForm::OnCategoriesChanged(void)
                }
        }
 
+       Footer* pFooter = GetFooter();
+
+       int modifiedItems = 0;
+       int itemCount = __pListView->GetItemCount();
+
+       for(int count = 0; count < itemCount; count++)
+       {
+               if(__pGroupListPresentationModel->IsContactInCategory(*__pGroupIdList, count) != __pListView->IsItemChecked(count))
+               {
+                       modifiedItems++;
+               }
+       }
+
+       if (pFooter != null)
+       {
+               if(modifiedItems > 0)
+               {
+                       pFooter->SetItemEnabled(1, true);
+               }
+               else
+               {
+                       pFooter->SetItemEnabled(1, false);
+               }
+
+               pFooter->Invalidate(true);
+       }
+
        __pListView->Invalidate(true);
        UpdateBottomLabel();
 }

diff --git a/src/CtTypes.cpp b/src/CtTypes.cpp
index d9a659d..f587da9 100644 (file)
--- a/src/CtTypes.cpp
+++ b/src/CtTypes.cpp
@@ -146,3 +146,4 @@ const int FONT_SIZE_DELETE_CONFIRM = 42;
 const int FONT_SIZE_DELETE_BUTTON = 36;
 
 const int BIRTHDAY_MIN_YEAR_DIFF = 100;
+const int BIRTHDAY_MAX_YEAR_DIFF = 35;