Skip to content
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.

Sign up for GitHub

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

SirsiDynix Issues: Not all dates are formatted based on setting in directory.php #320

Merged
merged 3 commits into from
Mar 28, 2018
Merged

SirsiDynix Issues: Not all dates are formatted based on setting in directory.php #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcb3658
fixes various date formatting issues
queryluke Oct 29, 2017
5d0b27e
Merge remote-tracking branch 'upstream/development' into date-formatt…
queryluke Jan 23, 2018
5e6b240
remove placeholders from cost form
queryluke Mar 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions management/ajax_forms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<tr>
<td colspan="2">
<label for="revisionDate" class="formText"><?php echo _("Last Document Revision:");?></label>
<div><input class="date-pick" type='input' id='revisionDate' name='revisionDate' value="<?php echo date("m/d/Y");?>" /></div>
<div><input class="date-pick" type='input' id='revisionDate' name='revisionDate' value="<?php echo format_date(date('m/d/Y'));?>" /></div>
</td>
</tr>
<?php
Expand Down Expand Up @@ -277,13 +277,13 @@

//if effective date isn't set, set it to today's date
if (($document->effectiveDate == "0000-00-00") || ($document->effectiveDate == "")){
$effectiveDate = date("m/d/Y");
$effectiveDate = format_date(date("m/d/Y"));
}else{
$effectiveDate=format_date($document->effectiveDate);
}
//if revision date isn't set, set it to today's date
if (($document->revisionDate == "0000-00-00") || ($document->revisionDate == "")){
$revisionDate = date("m/d/Y");
$revisionDate = format_date(date("m/d/Y"));
} else {
$revisionDate = format_date($document->revisionDate);
}
Expand Down
4 changes: 2 additions & 2 deletions resources/ajax_forms/getCostForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,10 @@
<input type='text' value='<?php echo $payment['year']; ?>' class='changeInput year costHistoryYear' />
</td>
<td>
<input type='text' value='<?php echo normalize_date($payment['subscriptionStartDate']); ?>' class='date-pick changeInput subscriptionStartDate costHistorySubStart' placeholder="mm/dd/yyyy" />
<input type='text' value='<?php echo normalize_date($payment['subscriptionStartDate']); ?>' class='date-pick changeInput subscriptionStartDate costHistorySubStart' />
</td>
<td>
<input type='text' value='<?php echo normalize_date($payment['subscriptionEndDate']); ?>' class='date-pick changeInput subscriptionEndDate costHistorySubEnd' placeholder="mm/dd/yyyy" />
<input type='text' value='<?php echo normalize_date($payment['subscriptionEndDate']); ?>' class='date-pick changeInput subscriptionEndDate costHistorySubEnd' />
</td>
<?php } ?>
<td>
Expand Down
4 changes: 2 additions & 2 deletions resources/ajax_forms/getOrderForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@

<tr>
<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='currentStartDate'><?php echo _("Sub Start:");?></label></td>
<td><input class='date-pick' id='currentStartDate' name='currentStartDate' value = '<?php echo $startDate; ?>' style='width:75px;' placeholder='mm/dd/yyyy' /></td>
<td><input class='date-pick' id='currentStartDate' name='currentStartDate' value = '<?php echo $startDate; ?>' style='width:75px;' /></td>
</tr>

<tr>
<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='currentEndDate'><?php echo _("Current Sub End:");?></label></td>
<td><input class='date-pick' id='currentEndDate' name='currentEndDate' value = '<?php echo $endDate; ?>' style='width:75px;' placeholder='mm/dd/yyyy' />
<td><input class='date-pick' id='currentEndDate' name='currentEndDate' value = '<?php echo $endDate; ?>' style='width:75px;' />
</td>
</tr>

Expand Down
2 changes: 1 addition & 1 deletion resources/ajax_htmldata/getSavedQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<tr id='tr_<?php echo $resource['resourceID']; ?>'>
<td <?php echo $classAdd; ?>><a href='ajax_forms.php?action=getNewResourceForm&height=483&width=775&resourceID=<?php echo $resource['resourceID']; ?>&modal=true' class='thickbox'><?php echo $resource['resourceID']; ?></a></td>
<td <?php echo $classAdd; ?>><a href='ajax_forms.php?action=getNewResourceForm&height=483&width=775&resourceID=<?php echo $resource['resourceID']; ?>&modal=true' class='thickbox'><?php echo $resource['titleText']; ?></a></td>
<td <?php echo $classAdd; ?>><?php echo $resource['createDate']; ?></td>
<td <?php echo $classAdd; ?>><?php echo format_date($resource['createDate']); ?></td>
<td <?php echo $classAdd; ?>><?php echo $status->shortName; ?></td>
<td <?php echo $classAdd; ?> style='text-align:right; width:40px;'>
<a href='ajax_forms.php?action=getNewResourceForm&height=483&width=775&resourceID=<?php echo $resource['resourceID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit request");?>'></a>&nbsp;
Expand Down
2 changes: 1 addition & 1 deletion resources/ajax_htmldata/getSubmittedQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<tr id='tr_<?php echo $resource['resourceID']; ?>'>
<td <?php echo $classAdd; ?>><a href='resource.php?resourceID=<?php echo $resource['resourceID']; ?>'><?php echo $resource['resourceID']; ?></a></td>
<td <?php echo $classAdd; ?>><a href='resource.php?resourceID=<?php echo $resource['resourceID']; ?>'><?php echo $resource['titleText']; ?></a></td>
<td <?php echo $classAdd; ?>><?php echo $resource['createDate']; ?></td>
<td <?php echo $classAdd; ?>><?php echo format_date($resource['createDate']); ?></td>
<td <?php echo $classAdd; ?>><?php echo $status->shortName; ?></td>
</td>
</tr>
Expand Down