X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=task-reporter.git;a=blobdiff_plain;f=src%2Fmain%2Fscala%2Fjp%2Fymir%2FtaskReporter%2Fcore%2FReport.scala;h=1963b6c799784f401fe0f1d428479ea02e5f5719;hp=e147e66b8fac731c72cf82824d0db29c0aa7bb36;hb=cb226bf20b21a6ebc1213152f96e7bcd465cda9d;hpb=f6a51dbcc510104994344140fccdeaab459eb570

diff --git a/src/main/scala/jp/ymir/taskReporter/core/Report.scala b/src/main/scala/jp/ymir/taskReporter/core/Report.scala
index e147e66..1963b6c 100644
--- a/src/main/scala/jp/ymir/taskReporter/core/Report.scala
+++ b/src/main/scala/jp/ymir/taskReporter/core/Report.scala
@@ -35,22 +35,22 @@ class Report(private val _date: Calendar) extends AbstractTableModel {
     column match {
       case 0 => "チケットID"
       case 1 => "作業名"
-      case 2 => "仮期限"
-      case 3 => "期限"
+      case 2 => "作業完了予定年月日"
+      case 3 => "タスク期限"
       case 4 => "状態"
-      case 5 => "補足"
+      case 5 => "説明"
     }
   }
 
   def getValueAt(row: Int, column: Int) : Object = {
     val task = _tasks(row)
     column match {
-      case 0 => task.ticketID : Integer
+      case 0 => task.ticketID.map(_.toString).getOrElse("")
       case 1 => task.title
-      case 2 => task.tentativeDeadline.map(dateString).getOrElse("")
-      case 3 => task.deadline         .map(dateString).getOrElse("")
+      case 2 => dateString(task.expectedCompletionDate)
+      case 3 => task.deadline.map(dateString).getOrElse("")
       case 4 => task.status
-      case 5 => task.supplement
+      case 5 => task.description.getOrElse("")
     }
   }
 }