From f13ec9784f238ed0f5e985da886171506e1240fd Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Fri, 8 Mar 2024 09:36:13 +0100
Subject: [PATCH] Fix https://github.com/pronamic/orbis.pronamic.nl/issues/44.

---
 languages/orbis-projects-nl_NL.mo | Bin 8088 -> 8199 bytes
 languages/orbis-projects-nl_NL.po |  29 +++++++++++++++--------
 languages/orbis-projects.pot      |  27 ++++++++++++++--------
 templates/projects-table-view.php |  37 +++++++++++++++++++++++++++++-
 4 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/languages/orbis-projects-nl_NL.mo b/languages/orbis-projects-nl_NL.mo
index b34cb2dec1079f348f9e357e55456b39e3e546c9..0d4494654507bf98aa9f17d2f9cf8961844d6287 100644
GIT binary patch
delta 3079
zcmYk-e@s?Y9LMnk@<V<Ff{FqKDrkgcpkfpRn35(aVo`u8il~?=^203BM}siw51dn@
zh0T_ktc|%b8#x<hS*u)*=A3Ruv}(D={3C30I$7_}^L)+Dp6`9#bMC$8$M>EKoq2on
zJ%iB!ha9DyNFX)`IM<J7#&V$ag*nI1ea;~o&touNvGyU1qCSid;9ZQw@Ni!}0Yj;$
zA(vd1)#oEWk1OV=2P=FHuGZX+LA1AEI<{NA4@0Q;qvrUXwf}^g*j20liW>MjYT_dp
zgFz9#e&aBh@!b?o)KMz3c$bNq&^)UbB0sl;1AVx1)JoQ)o~y_4*o^$#erx{#b>Amu
zF9uTY$JKZqV;JA1Fq&qXjatD1oP<Tl&(&}khmEKK+sqDB>O0MD)B;YU?(awSJAj(V
zHPoxQj{bNHJ?h{NCrVK`SM^{b#$yJmy%_Z>s!$WyfIQ;ra3Xq8ujDZDb4NL--;-AV
z5?QPpKt1=1c_WhitK+*g$N-*F2EtIOia~We+1jTeKbOWq6U#xp(`D9PjdbN2t-Tc|
zQ17&Q4{8DDP!swgiu^0pSM9>zsCRh>mAWX>p^U_HP{-+JE~<lK)QT#tz6p8M?La-h
z4>jOHT!}|84R2!{PWP}3y|V(;N()gdFF|FZ43(Kxs0q}d25v%4yan}q7ix2UXxDpi
z4D~a(7|-HD3?*F}rv&Gsr-Bo8v>){@yOEze%Rw{0gqpz5s8s%L-bQ{digam0$(V$h
z_z<qZM6AaL@ql>}5BoXyBeE$yu7**WoZE&Ps1?bMdk2-uBN&T4<~OJT2T}J8o1>@<
zMRBuIpM<)ehI&Q0W)W(fO3c*vzt$QKp+1u?)Bq<?DgDgazd}8D(b_MgCit6q6ZPr>
zNvC%cqcRwSYEM9AY^t?qVYI&gJWkY6DQc$GsCQJa8}JR(#5zzNzHir$nLVgI(1%;_
z3)Da}C;JwXkDAa@<dQ41_O0kqigt3Mm3E*8=t2$rG3t6BYJl%id*C7}Lw}efsQdlc
z(%N+6Q45-cB*mqg1vs60Icg%i<Lvu?j|L5V6qSK))E}Te)XFcRIvPSfcndX=aoof{
zax+l%9Mr^0Q7f)8H=_1L9qLsyqwd=iPyTgd2MwC>yQmePFi)d4)dkc8*HEeb3pJ5Z
z)Wl->*Qr-F3$=i3)b&NEg{?u7<Tj!DX+@25z{80KK8AYm6zWxcZ4RI&Fo+uX25Ke#
zd{Y`Q0;@3=XJIq)A-GRbuk0ME|8G$%zk-^;AZp>BVNR67o2VIu@bQve7mpes3)MkB
zYJ$sA|2(SjS**ro*n?W>D9*)TK7M5&7d2oRs-JbJ`<jpmc-$_#p$#>GgQ$Uyqb6_)
zm63j{UobDDKF1;C=l<lt-<AIgiE>RurM0BtVnThtKx`&f>-$gV<T0X^xL35oa;xNF
z4$)4mwYI6KbShIST3IsjvMLl!tdz(iwh=0?5HpBJRIxIK@xAYLBNh<_cA>_sMWy#i
zB8gC0Pdq`C5mkit$3jA-!H4&#FGnTcd%S;`$LT&ouh0Aa-@n8k8>?tyD!Yi+iC2kK
zVhZszq4GAN%{QBPjaWpiA@nJ#Bof+$TL^t6^~6e|k$9e9!+PAqoT!BQa2aMZYU5}(
z>;2aeDvuJobwbe}ot;Dqq0j68Wd)UNB9oX#yhW%iC-xB9q<i)LwfkQp#u6%Xe7GIv
zDpM>VmJs?YwvJ%4yB4C2P{}3ukX#`#lekx&;iQ7l7ZGBO8*r<3=X1nU#CD>XC?QlH
zC*r+l{NX@87jIc=zKQeg{6*8HWF$8vr6;9iCO7ofh2;eJ)%G5btO)d<J*U@yLWEzC
PT?&~vqD%k8eH8F7+^6~?

delta 2984
zcmYk-duWzb9Ki9TPMvc$olWz;yv|I`<<#Z8EuDEuU2|r&wY+O<&Sl=x?KN|0q)22b
zBHAB98b+5fFoKY<vZRZFnL$E^`G<5HN{T^!zwge%hxhk<&N=V<obx-EXWKD(|D?pl
z%#_yy*G{50QI--yBOXlU#<iwn2$@)e?QuKu3A?y;#{GB)9>WYg5$mThjrw`y6E4O2
z@0d>gCh}Y&w4-K2R<u91qdpRc<Cs`qiXEs|qPeY$?R98k^|8Ji9e6LA_+jjdAH?rJ
zLx2AjrZRpwM}bL)i|9;#iS;JzME!5%6WUU7CYfjgeeq5lf_y?jY@dn#t|VH4ZK+pc
z1=gSmoy9c950@#J(Vuu1-ar%S!mSHtqXXtf$D>O>HCl>JU^)8xN^}Kk(L{ElTeBBi
z;}P`vw=m%nouJ@@XRsIkgtp&Aw<4XVO`t2%6nbMf9ENU5A@T{cx!G}9tXCm(3AN~R
zuS5@^{T|C;{hj%HG`K`3&<;OF+fSn%ev2mbGrDxwVtXoIQVc!N_Mw=C6JostO?(BK
z$QpEo>tg%9&aA(C_$Cc5StGg<C((|-i(W!IXhLV=kE~}PO`#9^{0MZwd@RF49EOLn
zC!RsK>Q{84R}&PR`E_*0x6q|&!*op`4IQW_nt2Y|!4&jR7RB#NunqM^I0KjAG<+8w
z=sM=%zi2;sESFoDm_xy(TgJ`IH=zk^LznX9=waj&8o8O!7nqIbu`k}he%PJm?1N*Y
zrT9jx5Y{4NhcrgD|31iE6Ja0)mv9Vr$LY}ubf68$4?}%)AG$Kf&?Wycwx2?`=KJVn
zbf9aPi??EZ1cUfi<Y6b@|0xt)%DM52GW5ZfvAr5ia7%PIx@CvZEjxm)-0|4nh%83<
zD7Jrt&in_opQ~u1|6m8-|Bh^kKgdEe%RxIFjqcrq=yY`Ni*YqBKnMC1U8xIbLRXMa
z_#?Kb_Gn(gZs<gF(Ejr<`TkFgKPW~ASc2~TO0?s;=q@zT1L$FU2c6OT$YjDN(I0Uz
z^(Hit9vppFG#4E>A6<dMo~*xraEfVg=2d7%o6rYeMH6`&IX~fKte-;@yNb^ECVCcH
z(V1J5j((qsexHpdnuDID{OGJ+tiOk;oCY7LLYH(in!p}3p`++loJ2GKGJbynolz4q
z*>DT(CyRfj4m1EAI1hcU2;G9x=;8zg6R1W9w(d+`LkB#BOYkU;#B|;*4ss|!x2gmk
zU?Dp5RcHd$=*(-;m8(Y+I)E%zIF9z8_?&_roJBLdg#MHG3uodroQsoq$(`vQ^bg5?
zbcMb~2fTvza~=I%JN_7$KnD7KcQk=P=s07M1QMZ$f=e>5xgnHCSD=Tc2Kj`I-1s|^
zyqtlT1GQYMVqp?`W`+~w9!3!hh{p&I??c3RqL6U>Py{=ZmF6vo#s8TYOXWBtmbYP9
zEZ<Hom36l@IOG1Yz6?uaxft)Z%=lpo;Xetl<;^7T^|9=7)y4AA=nnK8JV$sy-Lmz>
z6r$y-rZAiERrRdgOSlye5RVgHiKn=2x5V{4F@e}bJWWg|a)>d+XkskUay>&~7BPf)
zvZXQV`S9}GOt!#PNvt7wLBdADv%<l4{`}h{Rwhf$r*$jkdx$597YNUXhiyKwnOIHm
zLL{#m?u&_~#9HD(VgOM>_)2CFo}<CULc*(x=tm?RKbt~6;U6FlZ&*Qi%^}(o_Ys`b
z<m>e!E+Xa;xx_T0fbjBd8A!ZDR1o8c`-w-1sYDtvh<KP7NjytzaDYdMhEp92QX1NK
bp5M0hsBsPDS)E!ntnc<)N<(F@gDL+3Am{7o

diff --git a/languages/orbis-projects-nl_NL.po b/languages/orbis-projects-nl_NL.po
index 4bd1bdc..5f3f1ef 100644
--- a/languages/orbis-projects-nl_NL.po
+++ b/languages/orbis-projects-nl_NL.po
@@ -4,8 +4,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Orbis Projects\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/orbis-projects\n"
-"POT-Creation-Date: 2024-03-08T08:17:30+00:00\n"
-"PO-Revision-Date: 2024-03-08 09:18+0100\n"
+"POT-Creation-Date: 2024-03-08T08:34:05+00:00\n"
+"PO-Revision-Date: 2024-03-08 09:34+0100\n"
 "Last-Translator: Remco Tolsma <info@remcotolsma.nl>\n"
 "Language-Team: Pronamic <info@pronamic.eu>\n"
 "Language: nl_NL\n"
@@ -115,7 +115,7 @@ msgstr "Afgerond"
 msgid "Project is finished"
 msgstr "Project is afgerond"
 
-#: admin/meta-box-project-details.php:151 templates/projects-table-view.php:45
+#: admin/meta-box-project-details.php:151 templates/projects-table-view.php:46
 msgid "Invoicable"
 msgstr "Factureerbaar"
 
@@ -131,7 +131,7 @@ msgstr "Gefactureerd"
 msgid "Project is invoiced"
 msgstr "Project is gefactureerd"
 
-#: admin/meta-box-project-details.php:182 templates/projects-table-view.php:105
+#: admin/meta-box-project-details.php:182 templates/projects-table-view.php:106
 msgid "Invoice reference"
 msgstr "Factuurreferentie"
 
@@ -554,31 +554,40 @@ msgid "Comment"
 msgstr "Reactie"
 
 #: templates/projects-table-view.php:44
+msgid "Period"
+msgstr "Periode"
+
+#: templates/projects-table-view.php:45
 msgid "Budget"
 msgstr "Budget"
 
-#: templates/projects-table-view.php:110
+#: templates/projects-table-view.php:111
 msgid "Line Description"
 msgstr "Regelbeschrijving"
 
 #. translators: 1st placeholder is the comment author, 2nd is the date
-#: templates/projects-table-view.php:137
+#: templates/projects-table-view.php:138
 msgid "%1$s says on %2$s:"
 msgstr "%1$s zegt op %2$s:"
 
-#: templates/projects-table-view.php:172
+#: templates/projects-table-view.php:173
 msgid "Add status"
 msgstr "Voeg status toe"
 
-#: templates/projects-table-view.php:221
+#. translators: 1: Period start date, 2: Period end date.
+#: templates/projects-table-view.php:224
+msgid "%1$s - %2$s"
+msgstr "%1$s - %2$s"
+
+#: templates/projects-table-view.php:256
 msgid "Yes"
 msgstr "Ja"
 
-#: templates/projects-table-view.php:232
+#: templates/projects-table-view.php:267
 msgid "No"
 msgstr "Nee"
 
-#: templates/projects-table-view.php:244
+#: templates/projects-table-view.php:279
 #: templates/projects-without-agreement.php:71
 msgid "Edit"
 msgstr "Bewerken"
diff --git a/languages/orbis-projects.pot b/languages/orbis-projects.pot
index 44b041a..7f31363 100644
--- a/languages/orbis-projects.pot
+++ b/languages/orbis-projects.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-03-08T08:17:30+00:00\n"
+"POT-Creation-Date: 2024-03-08T08:34:05+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: orbis-projects\n"
@@ -109,7 +109,7 @@ msgid "Project is finished"
 msgstr ""
 
 #: admin/meta-box-project-details.php:151
-#: templates/projects-table-view.php:45
+#: templates/projects-table-view.php:46
 msgid "Invoicable"
 msgstr ""
 
@@ -126,7 +126,7 @@ msgid "Project is invoiced"
 msgstr ""
 
 #: admin/meta-box-project-details.php:182
-#: templates/projects-table-view.php:105
+#: templates/projects-table-view.php:106
 msgid "Invoice reference"
 msgstr ""
 
@@ -569,31 +569,40 @@ msgid "Comment"
 msgstr ""
 
 #: templates/projects-table-view.php:44
+msgid "Period"
+msgstr ""
+
+#: templates/projects-table-view.php:45
 msgid "Budget"
 msgstr ""
 
-#: templates/projects-table-view.php:110
+#: templates/projects-table-view.php:111
 msgid "Line Description"
 msgstr ""
 
 #. translators: 1st placeholder is the comment author, 2nd is the date
-#: templates/projects-table-view.php:137
+#: templates/projects-table-view.php:138
 msgid "%1$s says on %2$s:"
 msgstr ""
 
-#: templates/projects-table-view.php:172
+#: templates/projects-table-view.php:173
 msgid "Add status"
 msgstr ""
 
-#: templates/projects-table-view.php:221
+#. translators: 1: Period start date, 2: Period end date.
+#: templates/projects-table-view.php:224
+msgid "%1$s - %2$s"
+msgstr ""
+
+#: templates/projects-table-view.php:256
 msgid "Yes"
 msgstr ""
 
-#: templates/projects-table-view.php:232
+#: templates/projects-table-view.php:267
 msgid "No"
 msgstr ""
 
-#: templates/projects-table-view.php:244
+#: templates/projects-table-view.php:279
 #: templates/projects-without-agreement.php:71
 msgid "Edit"
 msgstr ""
diff --git a/templates/projects-table-view.php b/templates/projects-table-view.php
index 6459121..d804f35 100644
--- a/templates/projects-table-view.php
+++ b/templates/projects-table-view.php
@@ -41,6 +41,7 @@
 
 				<th scope="col"><?php esc_html_e( 'Date', 'orbis-projects' ); ?></th>
 				<th scope="col"><?php esc_html_e( 'Comment', 'orbis-projects' ); ?></th>
+				<th scope="col"><?php esc_html_e( 'Period', 'orbis-projects' ); ?></th>
 				<th scope="col"><?php esc_html_e( 'Budget', 'orbis-projects' ); ?></th>
 				<th scope="col"><?php esc_html_e( 'Invoicable', 'orbis-projects' ); ?></th>
 				<th></th>
@@ -117,7 +118,7 @@
 						<?php endif; ?>
 
 						<td style="white-space: nowrap;">
-							<?php echo esc_html( get_the_time( 'j M Y', $project->project_post_id ) ); ?>
+							<?php echo esc_html( get_the_time( 'D j M Y', $project->project_post_id ) ); ?>
 						</td>
 						<td style="white-space: nowrap;">
 							<?php
@@ -194,6 +195,40 @@
 							<?php endif; ?>
 
 						</td>
+						<td style="white-space: nowrap;">
+							<?php
+
+							$start_date = null;
+
+							$start_date_string = \get_post_meta( $project->project_post_id, '_orbis_project_start_date', true );
+
+							if ( '' !== $start_date_string ) {
+								$value = DateTimeImmutable::createFromFormat( 'Y-m-d', $start_date_string );
+
+								$start_date = ( false === $value ) ? null : $value->setTime( 0, 0 );
+							}
+
+							$end_date = null;
+
+							$end_date_string = \get_post_meta( $project->project_post_id, '_orbis_project_end_date', true );
+
+							if ( '' !== $end_date_string ) {
+								$value = DateTimeImmutable::createFromFormat( 'Y-m-d', $end_date_string );
+
+								$end_date = ( false === $value ) ? null : $value->setTime( 0, 0 );
+							}
+
+							if ( null !== $start_date && null !== $end_date ) {
+								printf(
+									/* translators: 1: Period start date, 2: Period end date. */
+									\__( '%1$s - %2$s', 'orbis-projects' ),
+									( null === $start_date ) ? '?' : \esc_html( \date_i18n( 'D j M Y', $start_date->getTimestamp() ) ),
+									( null === $end_date ) ? '?' : \esc_html( \date_i18n( 'D j M Y', $end_date->getTimestamp() ) )
+								);
+							}
+
+							?>
+						</td>
 						<td style="white-space: nowrap;">
 							<span style="color: <?php echo esc_attr( $project->failed ? 'Red' : 'Green' ); ?>;">
 								<?php