new tsv

[task-reporter.git] / src / main / scala / jp / ymir / taskReporter / core / Report.scala

diff --git a/src/main/scala/jp/ymir/taskReporter/core/Report.scala b/src/main/scala/jp/ymir/taskReporter/core/Report.scala
index e147e66b8fac731c72cf82824d0db29c0aa7bb36..1963b6c799784f401fe0f1d428479ea02e5f5719 100644 (file)
--- 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 => "ä»®æ\9c\9fé\99\90"
-      case 3 => "期限"
+      case 2 => "ä½\9c業å®\8cäº\86äº\88å®\9aå¹´æ\9c\88æ\97¥"
+      case 3 => "タスク期限"
       case 4 => "状態"
-      case 5 => "è£\9c足"
+      case 5 => "説æ\98\8e"
     }
   }
 
   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("")
     }
   }
 }