Revision 39105
Added by Antonis Lempesis almost 9 years ago
| Request.java | ||
|---|---|---|
| 64 | 64 |
private Float other_cost; |
| 65 | 65 |
private Date date_paid; |
| 66 | 66 |
private int status = 0; |
| 67 |
private Date submissionDate = new Date(); |
|
| 68 |
private Date approvalDate = new Date(); |
|
| 67 | 69 |
|
| 68 | 70 |
public Request() {
|
| 69 | 71 |
} |
| 70 | 72 |
|
| 71 |
public Request(String id, String user, Date date, String researcher, String organization, String project, String publication, String journal, String publisher, String publisherEmail, String budget, String invoice, Float apc, Float discount, Float projectParticipation, Float fundingRequested, Currency currency, BankAccount bankAccount, List<RequestCoFunder> coFunders, Float apc_paid, Float transfer_cost, Float other_cost, Date date_paid, int status) {
|
|
| 73 |
public Request(String id, String user, Date date, String researcher, String organization, String project, String publication, String journal, String publisher, String publisherEmail, String budget, String invoice, Float apc, Float discount, Float projectParticipation, Float fundingRequested, Currency currency, BankAccount bankAccount, List<RequestCoFunder> coFunders, Float apc_paid, Float transfer_cost, Float other_cost, Date date_paid, int status, Date submissionDate, Date approvalDate) {
|
|
| 72 | 74 |
this.id = id; |
| 73 | 75 |
this.user = user; |
| 74 | 76 |
this.date = date; |
| ... | ... | |
| 93 | 95 |
this.other_cost = other_cost; |
| 94 | 96 |
this.date_paid = date_paid; |
| 95 | 97 |
this.status = status; |
| 98 |
this.submissionDate = submissionDate; |
|
| 99 |
this.approvalDate = approvalDate; |
|
| 96 | 100 |
} |
| 97 | 101 |
|
| 98 | 102 |
public Request(RequestInfo requestInfo) {
|
| ... | ... | |
| 116 | 120 |
other_cost = requestInfo.getOther_cost(); |
| 117 | 121 |
date_paid = requestInfo.getDate_paid(); |
| 118 | 122 |
status = requestInfo.getStatus().code; |
| 123 |
submissionDate = requestInfo.getSubmissionDate(); |
|
| 124 |
approvalDate = requestInfo.getApprovalDate(); |
|
| 119 | 125 |
|
| 120 | 126 |
if (requestInfo.getPublication() != null && requestInfo.getPublication().getJournal() != null) {
|
| 121 | 127 |
journal = requestInfo.getPublication().getJournal().getId(); |
| ... | ... | |
| 325 | 331 |
public void setDate_paid(Date date_paid) {
|
| 326 | 332 |
this.date_paid = date_paid; |
| 327 | 333 |
} |
| 334 |
|
|
| 335 |
public Date getSubmissionDate() {
|
|
| 336 |
return submissionDate; |
|
| 337 |
} |
|
| 338 |
|
|
| 339 |
public void setSubmissionDate(Date submissionDate) {
|
|
| 340 |
this.submissionDate = submissionDate; |
|
| 341 |
} |
|
| 342 |
|
|
| 343 |
public Date getApprovalDate() {
|
|
| 344 |
return approvalDate; |
|
| 345 |
} |
|
| 346 |
|
|
| 347 |
public void setApprovalDate(Date approvalDate) {
|
|
| 348 |
this.approvalDate = approvalDate; |
|
| 349 |
} |
|
| 328 | 350 |
} |
Also available in: Unified diff
Finished adding submission and approve dates