diff --git a/localization/ca/strings.po b/localization/ca/strings.po index 4b4c1627..5bf67af1 100644 --- a/localization/ca/strings.po +++ b/localization/ca/strings.po @@ -2651,3 +2651,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" msgstr[1] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/cs/strings.po b/localization/cs/strings.po index ad5160c8..7dde267e 100644 --- a/localization/cs/strings.po +++ b/localization/cs/strings.po @@ -2830,3 +2830,6 @@ msgstr[0] "Vytiskne se 1nálepka" msgstr[1] "Vytisknou se %1$s nálepky" msgstr[2] "Vytiskne se %1$s nálepek" msgstr[3] "Vytiskne se %1$s nálepek" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/da/strings.po b/localization/da/strings.po index 593187ee..4984b369 100644 --- a/localization/da/strings.po +++ b/localization/da/strings.po @@ -2684,3 +2684,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" msgstr[1] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/de/strings.po b/localization/de/strings.po index 8f13e8f7..94bafd61 100644 --- a/localization/de/strings.po +++ b/localization/de/strings.po @@ -2790,3 +2790,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "Dies bedeutet 1 Bestandseintragsetikett wird gedruckt" msgstr[1] "Dies bedeutet %1$s Bestandseintragsetiketten werden gedruckt" + +msgid "Estimated tracking" +msgstr "Geplante Ausführung" diff --git a/localization/el_GR/strings.po b/localization/el_GR/strings.po index 4f95af46..c3d3c1ef 100644 --- a/localization/el_GR/strings.po +++ b/localization/el_GR/strings.po @@ -2655,3 +2655,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" msgstr[1] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/en/strings.po b/localization/en/strings.po index 7f4a8cdf..21b0cb67 100644 --- a/localization/en/strings.po +++ b/localization/en/strings.po @@ -1205,3 +1205,6 @@ msgstr "This is required and can only contain letters and numbers" msgid "Edit userfield" msgstr "Edit userfield" + +msgid "Estimated tracking" +msgstr "Estimated tracking" diff --git a/localization/en_GB/strings.po b/localization/en_GB/strings.po index a83b6d3b..0d58767a 100644 --- a/localization/en_GB/strings.po +++ b/localization/en_GB/strings.po @@ -2672,3 +2672,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" msgstr[1] "" + +msgid "Estimated tracking" +msgstr "Estimated tracking" diff --git a/localization/es/strings.po b/localization/es/strings.po index be6e925f..1dd49971 100644 --- a/localization/es/strings.po +++ b/localization/es/strings.po @@ -2849,3 +2849,6 @@ msgid_plural "This means %1$s labels will be printed" msgstr[0] "Esto significa que 1 etiqueta será impresa" msgstr[1] "Esto significa que %1$s etiqueta será impresa" msgstr[2] "Esto significa que %1$s etiquetas serán impresas" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/et_EE/strings.po b/localization/et_EE/strings.po index c9f83395..fd1f896e 100644 --- a/localization/et_EE/strings.po +++ b/localization/et_EE/strings.po @@ -2741,3 +2741,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "See tähendab, et prinditakse üks etikett" msgstr[1] "See tähendab, et prinditakse %1$s etiketti" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/fi/strings.po b/localization/fi/strings.po index 85ffb9c7..3a5b10a2 100644 --- a/localization/fi/strings.po +++ b/localization/fi/strings.po @@ -2685,3 +2685,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" msgstr[1] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/fr/strings.po b/localization/fr/strings.po index a5c75593..19ef330f 100644 --- a/localization/fr/strings.po +++ b/localization/fr/strings.po @@ -2854,3 +2854,6 @@ msgid_plural "This means %1$s labels will be printed" msgstr[0] "Cela signifie que 1 étiquette sera imprimée" msgstr[1] "Cela signifie que %1$s étiquettes seront imprimées" msgstr[2] "Cela signifie que %1$s étiquettes seront imprimées" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/he_IL/strings.po b/localization/he_IL/strings.po index 07f6032e..d1015269 100644 --- a/localization/he_IL/strings.po +++ b/localization/he_IL/strings.po @@ -2769,3 +2769,6 @@ msgstr[0] "משמעות הדבר היא שתודפס תווית אחת" msgstr[1] "משמעות הדבר היא שתודפסנה %1$s תוויות" msgstr[2] "משמעות הדבר היא שתודפסנה %1$s תוויות" msgstr[3] "משמעות הדבר היא שתודפסנה %1$s תוויות" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/hu/strings.po b/localization/hu/strings.po index a7b98147..f267c2d8 100644 --- a/localization/hu/strings.po +++ b/localization/hu/strings.po @@ -2748,3 +2748,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" msgstr[1] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/it/strings.po b/localization/it/strings.po index 895230ff..beb680c1 100644 --- a/localization/it/strings.po +++ b/localization/it/strings.po @@ -2850,3 +2850,6 @@ msgid_plural "This means %1$s labels will be printed" msgstr[0] "Questo significa che verrà stampata 1 etichetta" msgstr[1] "Questo significa che verranno stampate %1$s etichette" msgstr[2] "Questo significa che verranno stampate %1$s etichette" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/ja/strings.po b/localization/ja/strings.po index 238bc7be..19e9cab6 100644 --- a/localization/ja/strings.po +++ b/localization/ja/strings.po @@ -2553,3 +2553,6 @@ msgstr "" msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/ko_KR/strings.po b/localization/ko_KR/strings.po index 957499f1..295048d9 100644 --- a/localization/ko_KR/strings.po +++ b/localization/ko_KR/strings.po @@ -2570,3 +2570,6 @@ msgstr "" msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/lt/strings.po b/localization/lt/strings.po index e0b22524..a448f1cd 100644 --- a/localization/lt/strings.po +++ b/localization/lt/strings.po @@ -2826,3 +2826,6 @@ msgstr[0] "Tai reiškia, kad bus atspausdinta 1 etiketė" msgstr[1] "Tai reiškia, kad bus atspausdintos %1$s etiketės" msgstr[2] "Tai reiškia, kad bus atspausdintos %1$s etikečių" msgstr[3] "Tai reiškia, kad bus atspausdintos %1$s etikečių" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/nl/strings.po b/localization/nl/strings.po index c22a79ee..c7fce3be 100644 --- a/localization/nl/strings.po +++ b/localization/nl/strings.po @@ -2817,3 +2817,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "Dit betekend dat 1 label wordt geprint" msgstr[1] "Dit betekend dat %1$s labels worden geprint" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/no/strings.po b/localization/no/strings.po index 44dcae32..d15b9859 100644 --- a/localization/no/strings.po +++ b/localization/no/strings.po @@ -2727,3 +2727,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" msgstr[1] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/pl/strings.po b/localization/pl/strings.po index a866387e..6633e005 100644 --- a/localization/pl/strings.po +++ b/localization/pl/strings.po @@ -2836,3 +2836,6 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/pt_BR/strings.po b/localization/pt_BR/strings.po index b9f852bc..d0bee0c7 100644 --- a/localization/pt_BR/strings.po +++ b/localization/pt_BR/strings.po @@ -2826,3 +2826,6 @@ msgid_plural "This means %1$s labels will be printed" msgstr[0] "Significa que 1 etiqueta será impressa" msgstr[1] "Significa que %1$s etiquetas serão impressas" msgstr[2] "Significa que %1$s etiquetas serão impressas" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/pt_PT/strings.po b/localization/pt_PT/strings.po index 94c7f536..8a8d4ad7 100644 --- a/localization/pt_PT/strings.po +++ b/localization/pt_PT/strings.po @@ -2687,3 +2687,6 @@ msgid_plural "This means %1$s labels will be printed" msgstr[0] "" msgstr[1] "" msgstr[2] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/ro_RO/strings.po b/localization/ro_RO/strings.po index 2b2425a3..be3cd33b 100644 --- a/localization/ro_RO/strings.po +++ b/localization/ro_RO/strings.po @@ -2700,3 +2700,6 @@ msgid_plural "This means %1$s labels will be printed" msgstr[0] "" msgstr[1] "" msgstr[2] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/ru/strings.po b/localization/ru/strings.po index 9a63e6a7..978015a8 100644 --- a/localization/ru/strings.po +++ b/localization/ru/strings.po @@ -2794,3 +2794,6 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/sk_SK/strings.po b/localization/sk_SK/strings.po index 97db773d..13132ec5 100644 --- a/localization/sk_SK/strings.po +++ b/localization/sk_SK/strings.po @@ -2693,3 +2693,6 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/sl/strings.po b/localization/sl/strings.po index 4aba2d2a..b0a061fd 100644 --- a/localization/sl/strings.po +++ b/localization/sl/strings.po @@ -2671,3 +2671,6 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/sv_SE/strings.po b/localization/sv_SE/strings.po index 25c32e9a..9e2bf249 100644 --- a/localization/sv_SE/strings.po +++ b/localization/sv_SE/strings.po @@ -2666,3 +2666,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" msgstr[1] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/ta/strings.po b/localization/ta/strings.po index 946c7b52..4e3601a7 100644 --- a/localization/ta/strings.po +++ b/localization/ta/strings.po @@ -2586,3 +2586,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" msgstr[1] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/tr/strings.po b/localization/tr/strings.po index 811d522e..4a1830d0 100644 --- a/localization/tr/strings.po +++ b/localization/tr/strings.po @@ -2607,3 +2607,6 @@ msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" msgstr[1] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/uk/strings.po b/localization/uk/strings.po index 30f23135..4d396008 100644 --- a/localization/uk/strings.po +++ b/localization/uk/strings.po @@ -2759,3 +2759,6 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/zh_CN/strings.po b/localization/zh_CN/strings.po index 0a3bc840..f316c0e6 100644 --- a/localization/zh_CN/strings.po +++ b/localization/zh_CN/strings.po @@ -2556,3 +2556,6 @@ msgstr "显示此产品价格时，将此产品数量单位做为产品价格的 msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "%1$s个标签将被打印" + +msgid "Estimated tracking" +msgstr "" diff --git a/localization/zh_TW/strings.po b/localization/zh_TW/strings.po index 42adc0e4..543e9a44 100644 --- a/localization/zh_TW/strings.po +++ b/localization/zh_TW/strings.po @@ -2554,3 +2554,6 @@ msgstr "" msgid "This means 1 label will be printed" msgid_plural "This means %1$s labels will be printed" msgstr[0] "" + +msgid "Estimated tracking" +msgstr "" diff --git a/migrations/0235.sql b/migrations/0235.sql new file mode 100644 index 00000000..3dba3c78 --- /dev/null +++ b/migrations/0235.sql @@ -0,0 +1,3 @@ +ALTER TABLE chores_log +ADD estimated_execution_time DATETIME; + diff --git a/services/ChoresService.php b/services/ChoresService.php index 5ee3313a..c05aa094 100644 --- a/services/ChoresService.php +++ b/services/ChoresService.php @@ -187,11 +187,13 @@ class ChoresService extends BaseService } } + $estimatedExecutionTime = $this->getDatabase()->chores_current()->where('chore_id', $choreId)->min('next_estimated_execution_time'); $logRow = $this->getDatabase()->chores_log()->createRow([ 'chore_id' => $choreId, 'tracked_time' => $trackedTime, 'done_by_user_id' => $doneBy, - 'skipped' => BoolToInt($skipped) + 'skipped' => BoolToInt($skipped), + 'estimated_execution_time' => $estimatedExecutionTime ]); $logRow->save(); $lastInsertId = $this->getDatabase()->lastInsertId(); diff --git a/views/choresjournal.blade.php b/views/choresjournal.blade.php index 297ae83b..e863b87a 100644 --- a/views/choresjournal.blade.php +++ b/views/choresjournal.blade.php @@ -91,6 +91,7 @@ {{ $__t('Chore') }} {{ $__t('Tracked time') }} + {{ $__t('Estimated tracking') }} @if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS) {{ $__t('Done by') }} @endif @@ -131,6 +132,11 @@ {{ $__t('Skipped') }} @endif + + {{ $choreLogEntry->estimated_execution_time }} + + @if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS) @if ($choreLogEntry->done_by_user_id !== null && !empty($choreLogEntry->done_by_user_id))