| @@ -117,7 +117,7 pdf.SetFont('Arial','B',7) | |||||
| 117 | i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from ) |
|
117 | i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from ) | |
| 118 | i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to ) |
|
118 | i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to ) | |
| 119 |
|
119 | |||
| 120 | i_done_date = i.start_date + ((i.due_date - i.start_date)*i.done_ratio/100).floor |
|
120 | i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor | |
| 121 | i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date ) |
|
121 | i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date ) | |
| 122 | i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date ) |
|
122 | i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date ) | |
| 123 |
|
123 | |||
| @@ -202,7 +202,7 top = headers_heigth + 12 | |||||
| 202 | i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from ) |
|
202 | i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from ) | |
| 203 | i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to ) |
|
203 | i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to ) | |
| 204 |
|
204 | |||
| 205 | i_done_date = i.start_date + ((i.due_date - i.start_date)*i.done_ratio/100).floor |
|
205 | i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor | |
| 206 | i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date ) |
|
206 | i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date ) | |
| 207 | i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date ) |
|
207 | i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date ) | |
| 208 |
|
208 | |||
General Comments 0
You need to be logged in to leave comments.
Login now