Skip to content

Commit 6230364

Browse files
alainm23alainm23
authored
Merge branch 'master' into fix/2034
2 parents 659957b + 489c1c7 commit 6230364

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+958
-925
lines changed

‎core/Objects/Item.vala‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1523,6 +1523,7 @@ public class Objects.Item : Objects.BaseObject {
15231523
_move (project.id, _section_id);
15241524
} else if (project.source_type == SourceType.TODOIST) {
15251525
loading = true;
1526+
sensitive = false;
15261527

15271528
string move_id = project.id;
15281529
string move_type = "project_id";
@@ -1543,7 +1544,8 @@ public class Objects.Item : Objects.BaseObject {
15431544
});
15441545
} else if (project.source_type == SourceType.CALDAV) {
15451546
loading = true;
1546-
1547+
sensitive = false;
1548+
15471549
move_caldav_recursive.begin (project, _section_id);
15481550
}
15491551
}
@@ -1762,4 +1764,29 @@ public class Objects.Item : Objects.BaseObject {
17621764

17631765
return response;
17641766
}
1767+
1768+
public void to_string () {
1769+
print ("_________________________________\n");
1770+
print ("ID: %s\n", id);
1771+
print ("Content: %s\n", content);
1772+
print ("Description: %s\n", description);
1773+
print ("Project ID: %s\n", project_id);
1774+
print ("Section ID: %s\n", section_id);
1775+
print ("Parent ID: %s\n", parent_id);
1776+
print ("Priority: %d (%s)\n", priority, priority_text);
1777+
print ("Checked: %s\n", checked ? "true" : "false");
1778+
print ("Pinned: %s\n", pinned ? "true" : "false");
1779+
print ("Has Due: %s\n", has_due ? "true" : "false");
1780+
if (has_due) {
1781+
print ("Due Date: %s\n", due.date);
1782+
}
1783+
print ("Child Order: %d\n", child_order);
1784+
print ("Added At: %s\n", added_at);
1785+
print ("Completed At: %s\n", completed_at);
1786+
print ("Labels: %d\n", labels.size);
1787+
foreach (var label in labels) {
1788+
print (" - %s\n", label.name);
1789+
}
1790+
print ("---------------------------------\n");
1791+
}
17651792
}

‎core/Utils/Util.vala‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ We hope you’ll enjoy using Planify!""");
809809
return generator.to_data (null);
810810
}
811811

812-
public async void move_backend_type_item (Objects.Item item, Objects.Project target_project, string parent_id = "") {
812+
public async void move_backend_type_item (Objects.Item item, Objects.Project target_project, string parent_id = "", bool notify = true) {
813813
var new_item = item.duplicate ();
814814
new_item.project_id = target_project.id;
815815
new_item.parent_id = parent_id;
@@ -819,14 +819,14 @@ We hope you’ll enjoy using Planify!""");
819819

820820
if (target_project.source_type == SourceType.LOCAL) {
821821
new_item.id = Util.get_default ().generate_id (new_item);
822-
yield add_final_duplicate_item (new_item, item);
822+
yield add_final_duplicate_item (new_item, item, notify);
823823
} else if (target_project.source_type == SourceType.TODOIST) {
824824
HttpResponse response = yield Services.Todoist.get_default ().add (new_item);
825825
item.loading = false;
826826

827827
if (response.status) {
828828
new_item.id = response.data;
829-
yield add_final_duplicate_item (new_item, item);
829+
yield add_final_duplicate_item (new_item, item, notify);
830830
}
831831
} else if (target_project.source_type == SourceType.CALDAV) {
832832
new_item.id = Util.get_default ().generate_id (new_item);
@@ -836,13 +836,17 @@ We hope you’ll enjoy using Planify!""");
836836
item.loading = false;
837837

838838
if (response.status) {
839-
yield add_final_duplicate_item (new_item, item);
839+
yield add_final_duplicate_item (new_item, item, notify);
840840
}
841841
}
842842
}
843843

844-
public async void add_final_duplicate_item (Objects.Item new_item, Objects.Item item) {
845-
new_item.project.add_item_if_not_exists (new_item);
844+
public async void add_final_duplicate_item (Objects.Item new_item, Objects.Item item, bool notify = true) {
845+
if (new_item.has_parent) {
846+
new_item.parent.add_item_if_not_exists (new_item);
847+
} else {
848+
new_item.project.add_item_if_not_exists (new_item);
849+
}
846850

847851
foreach (Objects.Reminder reminder in item.reminders) {
848852
var _reminder = reminder.duplicate ();
@@ -859,12 +863,14 @@ We hope you’ll enjoy using Planify!""");
859863
}
860864

861865
foreach (Objects.Item subitem in item.items) {
862-
yield move_backend_type_item (subitem, new_item.project, new_item.id);
866+
yield move_backend_type_item (subitem, new_item.project, new_item.id, false);
863867
}
864868

865-
Services.EventBus.get_default ().send_toast (
866-
create_toast (_("Task moved to %s".printf (new_item.project.name)))
867-
);
869+
if (notify) {
870+
Services.EventBus.get_default ().send_toast (
871+
create_toast (_("Task moved to %s".printf (new_item.project.name)))
872+
);
873+
}
868874

869875
item.delete_item ();
870876
}

‎po/af.po‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ msgstr ""
320320
msgid "Task copied to clipboard"
321321
msgstr ""
322322

323-
#: core/Objects/Item.vala:1609 core/Utils/Util.vala:866
323+
#: core/Objects/Item.vala:1611 core/Utils/Util.vala:871
324324
#, c-format
325325
msgid "Task moved to %s"
326326
msgstr ""
@@ -942,43 +942,43 @@ msgstr ""
942942
msgid "🏃‍♀️️Follow Up"
943943
msgstr ""
944944

945-
#: core/Utils/Util.vala:945
945+
#: core/Utils/Util.vala:951
946946
msgid "Task duplicated"
947947
msgstr ""
948948

949-
#: core/Utils/Util.vala:981
949+
#: core/Utils/Util.vala:987
950950
msgid "Section duplicated"
951951
msgstr ""
952952

953-
#: core/Utils/Util.vala:1007 core/Utils/Util.vala:1033
953+
#: core/Utils/Util.vala:1013 core/Utils/Util.vala:1039
954954
msgid "Project duplicated"
955955
msgstr ""
956956

957-
#: core/Utils/Util.vala:1075 src/Dialogs/Preferences/Pages/TaskSetting.vala:153
957+
#: core/Utils/Util.vala:1081 src/Dialogs/Preferences/Pages/TaskSetting.vala:153
958958
msgid "At due time"
959959
msgstr ""
960960

961-
#: core/Utils/Util.vala:1078 src/Dialogs/Preferences/Pages/TaskSetting.vala:154
961+
#: core/Utils/Util.vala:1084 src/Dialogs/Preferences/Pages/TaskSetting.vala:154
962962
msgid "10 minutes before"
963963
msgstr ""
964964

965-
#: core/Utils/Util.vala:1081 src/Dialogs/Preferences/Pages/TaskSetting.vala:155
965+
#: core/Utils/Util.vala:1087 src/Dialogs/Preferences/Pages/TaskSetting.vala:155
966966
msgid "30 minutes before"
967967
msgstr ""
968968

969-
#: core/Utils/Util.vala:1084 src/Dialogs/Preferences/Pages/TaskSetting.vala:156
969+
#: core/Utils/Util.vala:1090 src/Dialogs/Preferences/Pages/TaskSetting.vala:156
970970
msgid "45 minutes before"
971971
msgstr ""
972972

973-
#: core/Utils/Util.vala:1087 src/Dialogs/Preferences/Pages/TaskSetting.vala:157
973+
#: core/Utils/Util.vala:1093 src/Dialogs/Preferences/Pages/TaskSetting.vala:157
974974
msgid "1 hour before"
975975
msgstr ""
976976

977-
#: core/Utils/Util.vala:1090 src/Dialogs/Preferences/Pages/TaskSetting.vala:158
977+
#: core/Utils/Util.vala:1096 src/Dialogs/Preferences/Pages/TaskSetting.vala:158
978978
msgid "2 hours before"
979979
msgstr ""
980980

981-
#: core/Utils/Util.vala:1093 src/Dialogs/Preferences/Pages/TaskSetting.vala:159
981+
#: core/Utils/Util.vala:1099 src/Dialogs/Preferences/Pages/TaskSetting.vala:159
982982
msgid "3 hours before"
983983
msgstr ""
984984

‎po/ak.po‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ msgstr ""
320320
msgid "Task copied to clipboard"
321321
msgstr ""
322322

323-
#: core/Objects/Item.vala:1609 core/Utils/Util.vala:866
323+
#: core/Objects/Item.vala:1611 core/Utils/Util.vala:871
324324
#, c-format
325325
msgid "Task moved to %s"
326326
msgstr ""
@@ -942,43 +942,43 @@ msgstr ""
942942
msgid "🏃‍♀️️Follow Up"
943943
msgstr ""
944944

945-
#: core/Utils/Util.vala:945
945+
#: core/Utils/Util.vala:951
946946
msgid "Task duplicated"
947947
msgstr ""
948948

949-
#: core/Utils/Util.vala:981
949+
#: core/Utils/Util.vala:987
950950
msgid "Section duplicated"
951951
msgstr ""
952952

953-
#: core/Utils/Util.vala:1007 core/Utils/Util.vala:1033
953+
#: core/Utils/Util.vala:1013 core/Utils/Util.vala:1039
954954
msgid "Project duplicated"
955955
msgstr ""
956956

957-
#: core/Utils/Util.vala:1075 src/Dialogs/Preferences/Pages/TaskSetting.vala:153
957+
#: core/Utils/Util.vala:1081 src/Dialogs/Preferences/Pages/TaskSetting.vala:153
958958
msgid "At due time"
959959
msgstr ""
960960

961-
#: core/Utils/Util.vala:1078 src/Dialogs/Preferences/Pages/TaskSetting.vala:154
961+
#: core/Utils/Util.vala:1084 src/Dialogs/Preferences/Pages/TaskSetting.vala:154
962962
msgid "10 minutes before"
963963
msgstr ""
964964

965-
#: core/Utils/Util.vala:1081 src/Dialogs/Preferences/Pages/TaskSetting.vala:155
965+
#: core/Utils/Util.vala:1087 src/Dialogs/Preferences/Pages/TaskSetting.vala:155
966966
msgid "30 minutes before"
967967
msgstr ""
968968

969-
#: core/Utils/Util.vala:1084 src/Dialogs/Preferences/Pages/TaskSetting.vala:156
969+
#: core/Utils/Util.vala:1090 src/Dialogs/Preferences/Pages/TaskSetting.vala:156
970970
msgid "45 minutes before"
971971
msgstr ""
972972

973-
#: core/Utils/Util.vala:1087 src/Dialogs/Preferences/Pages/TaskSetting.vala:157
973+
#: core/Utils/Util.vala:1093 src/Dialogs/Preferences/Pages/TaskSetting.vala:157
974974
msgid "1 hour before"
975975
msgstr ""
976976

977-
#: core/Utils/Util.vala:1090 src/Dialogs/Preferences/Pages/TaskSetting.vala:158
977+
#: core/Utils/Util.vala:1096 src/Dialogs/Preferences/Pages/TaskSetting.vala:158
978978
msgid "2 hours before"
979979
msgstr ""
980980

981-
#: core/Utils/Util.vala:1093 src/Dialogs/Preferences/Pages/TaskSetting.vala:159
981+
#: core/Utils/Util.vala:1099 src/Dialogs/Preferences/Pages/TaskSetting.vala:159
982982
msgid "3 hours before"
983983
msgstr ""
984984

‎po/ar.po‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ msgstr "غير مسمى"
321321
msgid "Task copied to clipboard"
322322
msgstr "تم نسخ المهمة الى الحافظة"
323323

324-
#: core/Objects/Item.vala:1609 core/Utils/Util.vala:866
324+
#: core/Objects/Item.vala:1611 core/Utils/Util.vala:871
325325
#, c-format
326326
msgid "Task moved to %s"
327327
msgstr "تم نسخ المهمة الى%s"
@@ -945,43 +945,43 @@ msgstr ""
945945
msgid "🏃‍♀️️Follow Up"
946946
msgstr ""
947947

948-
#: core/Utils/Util.vala:945
948+
#: core/Utils/Util.vala:951
949949
msgid "Task duplicated"
950950
msgstr ""
951951

952-
#: core/Utils/Util.vala:981
952+
#: core/Utils/Util.vala:987
953953
msgid "Section duplicated"
954954
msgstr ""
955955

956-
#: core/Utils/Util.vala:1007 core/Utils/Util.vala:1033
956+
#: core/Utils/Util.vala:1013 core/Utils/Util.vala:1039
957957
msgid "Project duplicated"
958958
msgstr ""
959959

960-
#: core/Utils/Util.vala:1075 src/Dialogs/Preferences/Pages/TaskSetting.vala:153
960+
#: core/Utils/Util.vala:1081 src/Dialogs/Preferences/Pages/TaskSetting.vala:153
961961
msgid "At due time"
962962
msgstr ""
963963

964-
#: core/Utils/Util.vala:1078 src/Dialogs/Preferences/Pages/TaskSetting.vala:154
964+
#: core/Utils/Util.vala:1084 src/Dialogs/Preferences/Pages/TaskSetting.vala:154
965965
msgid "10 minutes before"
966966
msgstr ""
967967

968-
#: core/Utils/Util.vala:1081 src/Dialogs/Preferences/Pages/TaskSetting.vala:155
968+
#: core/Utils/Util.vala:1087 src/Dialogs/Preferences/Pages/TaskSetting.vala:155
969969
msgid "30 minutes before"
970970
msgstr ""
971971

972-
#: core/Utils/Util.vala:1084 src/Dialogs/Preferences/Pages/TaskSetting.vala:156
972+
#: core/Utils/Util.vala:1090 src/Dialogs/Preferences/Pages/TaskSetting.vala:156
973973
msgid "45 minutes before"
974974
msgstr ""
975975

976-
#: core/Utils/Util.vala:1087 src/Dialogs/Preferences/Pages/TaskSetting.vala:157
976+
#: core/Utils/Util.vala:1093 src/Dialogs/Preferences/Pages/TaskSetting.vala:157
977977
msgid "1 hour before"
978978
msgstr ""
979979

980-
#: core/Utils/Util.vala:1090 src/Dialogs/Preferences/Pages/TaskSetting.vala:158
980+
#: core/Utils/Util.vala:1096 src/Dialogs/Preferences/Pages/TaskSetting.vala:158
981981
msgid "2 hours before"
982982
msgstr ""
983983

984-
#: core/Utils/Util.vala:1093 src/Dialogs/Preferences/Pages/TaskSetting.vala:159
984+
#: core/Utils/Util.vala:1099 src/Dialogs/Preferences/Pages/TaskSetting.vala:159
985985
msgid "3 hours before"
986986
msgstr ""
987987

‎po/az.po‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ msgstr ""
320320
msgid "Task copied to clipboard"
321321
msgstr ""
322322

323-
#: core/Objects/Item.vala:1609 core/Utils/Util.vala:866
323+
#: core/Objects/Item.vala:1611 core/Utils/Util.vala:871
324324
#, c-format
325325
msgid "Task moved to %s"
326326
msgstr ""
@@ -942,43 +942,43 @@ msgstr ""
942942
msgid "🏃‍♀️️Follow Up"
943943
msgstr ""
944944

945-
#: core/Utils/Util.vala:945
945+
#: core/Utils/Util.vala:951
946946
msgid "Task duplicated"
947947
msgstr ""
948948

949-
#: core/Utils/Util.vala:981
949+
#: core/Utils/Util.vala:987
950950
msgid "Section duplicated"
951951
msgstr ""
952952

953-
#: core/Utils/Util.vala:1007 core/Utils/Util.vala:1033
953+
#: core/Utils/Util.vala:1013 core/Utils/Util.vala:1039
954954
msgid "Project duplicated"
955955
msgstr ""
956956

957-
#: core/Utils/Util.vala:1075 src/Dialogs/Preferences/Pages/TaskSetting.vala:153
957+
#: core/Utils/Util.vala:1081 src/Dialogs/Preferences/Pages/TaskSetting.vala:153
958958
msgid "At due time"
959959
msgstr ""
960960

961-
#: core/Utils/Util.vala:1078 src/Dialogs/Preferences/Pages/TaskSetting.vala:154
961+
#: core/Utils/Util.vala:1084 src/Dialogs/Preferences/Pages/TaskSetting.vala:154
962962
msgid "10 minutes before"
963963
msgstr ""
964964

965-
#: core/Utils/Util.vala:1081 src/Dialogs/Preferences/Pages/TaskSetting.vala:155
965+
#: core/Utils/Util.vala:1087 src/Dialogs/Preferences/Pages/TaskSetting.vala:155
966966
msgid "30 minutes before"
967967
msgstr ""
968968

969-
#: core/Utils/Util.vala:1084 src/Dialogs/Preferences/Pages/TaskSetting.vala:156
969+
#: core/Utils/Util.vala:1090 src/Dialogs/Preferences/Pages/TaskSetting.vala:156
970970
msgid "45 minutes before"
971971
msgstr ""
972972

973-
#: core/Utils/Util.vala:1087 src/Dialogs/Preferences/Pages/TaskSetting.vala:157
973+
#: core/Utils/Util.vala:1093 src/Dialogs/Preferences/Pages/TaskSetting.vala:157
974974
msgid "1 hour before"
975975
msgstr ""
976976

977-
#: core/Utils/Util.vala:1090 src/Dialogs/Preferences/Pages/TaskSetting.vala:158
977+
#: core/Utils/Util.vala:1096 src/Dialogs/Preferences/Pages/TaskSetting.vala:158
978978
msgid "2 hours before"
979979
msgstr ""
980980

981-
#: core/Utils/Util.vala:1093 src/Dialogs/Preferences/Pages/TaskSetting.vala:159
981+
#: core/Utils/Util.vala:1099 src/Dialogs/Preferences/Pages/TaskSetting.vala:159
982982
msgid "3 hours before"
983983
msgstr ""
984984

0 commit comments

Comments
 (0)