-
Notifications
You must be signed in to change notification settings - Fork 264
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix in Patient Issues Showing Incorrect Date When left Blank #1617
base: master
Are you sure you want to change the base?
Fix in Patient Issues Showing Incorrect Date When left Blank #1617
Conversation
please can you send us a screenshot of the fix. |
ok let me do that now
…On Fri, 19 Jun 2020 at 09:24, Ngai Elizabeth ***@***.***> wrote:
This is a fix in issue #1555
<#1555>. The Patient
'Issues' now does not display incorrect date without entry.
please can you send us a screenshot of the fix.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#1617 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AOQABPC2ETOXDBH5J3AFB5DRXMODBANCNFSM4OCPY3NQ>
.
|
This is after the fix. The beginning and end date does not show again
unless the field is entered.
![image](https://user-images.githubusercontent.com/60817596/85114815-8c3a2e00-b212-11ea-9daa-0afa72970a58.png)
…On Fri, 19 Jun 2020 at 09:40, ahani peitra ***@***.***> wrote:
ok let me do that now
On Fri, 19 Jun 2020 at 09:24, Ngai Elizabeth ***@***.***>
wrote:
> This is a fix in issue #1555
> <#1555>. The Patient
> 'Issues' now does not display incorrect date without entry.
>
> please can you send us a screenshot of the fix.
>
> —
> You are receiving this because you authored the thread.
> Reply to this email directly, view it on GitHub
> <#1617 (comment)>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AOQABPC2ETOXDBH5J3AFB5DRXMODBANCNFSM4OCPY3NQ>
> .
>
|
echo " <td>" . text(date(DateFormatRead(true), strtotime($row['begdate']))) . " </td>\n"; | ||
echo " <td>" . text(date(DateFormatRead(true), strtotime($row['enddate']))) . " </td>\n"; | ||
echo " <td>" . text($row['begdate']) . " </td>\n"; | ||
echo " <td>" . text($row['enddate']) . " </td>\n"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not the right approach! Just check if the value is NULL
or ""
then show a default -
, the functions there are not be removed
ok
…On Fri, 26 Jun 2020 at 04:39, muarachmann ***@***.***> wrote:
***@***.**** requested changes on this pull request.
------------------------------
In interface/patient_file/summary/stats_full.php
<#1617 (comment)>:
> @@ -285,8 +285,8 @@ function newEncounter() {
echo " <tr class='$bgclass detail' $colorstyle>\n";
echo " <td style='text-align:left' data-text='$disptitle' class='$click_class' id='$rowid'>" . text($disptitle) . "</td>\n";
- echo " <td>" . text(date(DateFormatRead(true), strtotime($row['begdate']))) . " </td>\n";
- echo " <td>" . text(date(DateFormatRead(true), strtotime($row['enddate']))) . " </td>\n";
+ echo " <td>" . text($row['begdate']) . " </td>\n";
+ echo " <td>" . text($row['enddate']) . " </td>\n";
This is not the right approach! Just check if the value is NULL or ""
then show a default -, the functions there are not be removed
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#1617 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AOQABPBX4CGVPEWF76TIYATRYQJ63ANCNFSM4OCPY3NQ>
.
|
I will fix that
…On Fri, 26 Jun 2020 at 08:21, ahani peitra ***@***.***> wrote:
ok
On Fri, 26 Jun 2020 at 04:39, muarachmann ***@***.***>
wrote:
> ***@***.**** requested changes on this pull request.
> ------------------------------
>
> In interface/patient_file/summary/stats_full.php
> <#1617 (comment)>
> :
>
> > @@ -285,8 +285,8 @@ function newEncounter() {
>
> echo " <tr class='$bgclass detail' $colorstyle>\n";
> echo " <td style='text-align:left' data-text='$disptitle' class='$click_class' id='$rowid'>" . text($disptitle) . "</td>\n";
> - echo " <td>" . text(date(DateFormatRead(true), strtotime($row['begdate']))) . " </td>\n";
> - echo " <td>" . text(date(DateFormatRead(true), strtotime($row['enddate']))) . " </td>\n";
> + echo " <td>" . text($row['begdate']) . " </td>\n";
> + echo " <td>" . text($row['enddate']) . " </td>\n";
>
> This is not the right approach! Just check if the value is NULL or ""
> then show a default -, the functions there are not be removed
>
> —
> You are receiving this because you authored the thread.
> Reply to this email directly, view it on GitHub
> <#1617 (review)>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AOQABPBX4CGVPEWF76TIYATRYQJ63ANCNFSM4OCPY3NQ>
> .
>
|
echo " <td>" . text($row['begdate']) . " </td>\n"; | ||
echo " <td>" . text($row['enddate']) . " </td>\n"; | ||
echo " <td>" . text(date(DateFormatRead(true), date($row['begdate']))) . " </td>\n"; | ||
echo " <td>" . text(date(DateFormatRead(true), date($row['enddate']))) . " </td>\n"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes we need some if/else statement here for blank dates
I tried the if/else statement but it was not functional then noticed the
problem was caused by the "strtotime()" which outputs 1970 01 01 as date by
default so thats y i changed it to a normal date
…On Sat, 4 Jul 2020 at 01:55, muarachmann ***@***.***> wrote:
***@***.**** requested changes on this pull request.
------------------------------
In interface/patient_file/summary/stats_full.php
<#1617 (comment)>:
> @@ -285,8 +285,8 @@ function newEncounter() {
echo " <tr class='$bgclass detail' $colorstyle>\n";
echo " <td style='text-align:left' data-text='$disptitle' class='$click_class' id='$rowid'>" . text($disptitle) . "</td>\n";
- echo " <td>" . text($row['begdate']) . " </td>\n";
- echo " <td>" . text($row['enddate']) . " </td>\n";
+ echo " <td>" . text(date(DateFormatRead(true), date($row['begdate']))) . " </td>\n";
+ echo " <td>" . text(date(DateFormatRead(true), date($row['enddate']))) . " </td>\n";
Yes we need some if/else statement here for blank dates
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#1617 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AOQABPE6HIYDQG3WZ5KP25TRZZ4W7ANCNFSM4OCPY3NQ>
.
|
@ahanipeitra1994 it seems to still show the default timedate for me, even with date(). Can you push the if/else statements that you used? We can help guide you to a working solution if we can see the code. |
ok i will do that |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks better. Will test this.
This is a fix on issue #1555. The Patient 'Issues' now does not display incorrect date without entry.