Skip to content
Snippets Groups Projects
Commit ff01c4ec authored by FALKE JANOS's avatar FALKE JANOS :island:
Browse files

Ordre croissant des dates + format des dates de transactions

parent 3f3db2fb
Branches
1 merge request!10Develop
......@@ -40,7 +40,7 @@ export const fetchUserTransactions = (student_number) => {
response.json().then(data => {
console.log(data);
let balance = data.rows.map(data => data.amount).reduce((sum, amount) => sum + amount);
let data_sorted = data.rows.sort(function(a,b){return Date.parse(a.concluded_at) - Date.parse(b.concluded_at)});
let data_sorted = data.rows.sort(function(a,b){return Date.parse(b.concluded_at) - Date.parse(a.concluded_at)});
dispatch(transactionDataFetchSuccess({balance: balance, transactions: data_sorted}));
}).catch(err => dispatch(transactionDataFetchFailure(err)));
}
......
......@@ -28,6 +28,32 @@ export class Bank extends React.Component {
console.log('MOUNT PROPS', this.props);
}
convertDate(formated_Date){
const date = new Date(formated_Date);
let day = parseInt(date.getDate());
if(day < 10){
day = "0" + day;
}
let month = parseInt(date.getMonth() + 1);
if(month < 10){
month = "0" + month;
}
let hours = parseInt(date.getHours());
if(hours < 10){
hours = "0" + hours;
}
let minutes = parseInt(date.getMinutes());
if(minutes < 10){
minutes = "0" + minutes;
}
return day + "/" + month + "/" + date.getFullYear() + " " + hours + ":" + minutes;
}
render() {
return (
<div>
......@@ -54,7 +80,7 @@ export class Bank extends React.Component {
return (
<tr key={'trans'+transaction.id}>
<td><Image src={logo_trans} alt='transaction' width={30} height={30} /></td>
<td style={{fontStyle:'italic'}} colSpan='3'>{transaction.concluded_at}</td>
<td style={{fontStyle:'italic'}} colSpan='3'>{this.convertDate(transaction.concluded_at)}</td>
<td style={{fontStyle:'italic', color:'#242424'}} colSpan='3'>{transaction.comment}</td>
<td>{transaction.amount}</td>
</tr>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment