taskjuggler 3.0.0 → 3.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (553) hide show
  1. data/CHANGELOG +61 -0
  2. data/README.rdoc +43 -27
  3. data/data/css/tjreport.css +30 -0
  4. data/data/tjp.vim +100 -89
  5. data/examples/ProjectTemplate/template.tjp +338 -0
  6. data/examples/ToDo-List/todolist.tjp +84 -0
  7. data/examples/{tutorial.tjp → Tutorial/tutorial.tjp} +9 -7
  8. data/lib/header.tmpl +1 -1
  9. data/lib/taskjuggler/Account.rb +2 -2
  10. data/lib/taskjuggler/AccountCredit.rb +29 -0
  11. data/lib/taskjuggler/AccountScenario.rb +73 -7
  12. data/lib/taskjuggler/AlertLevelDefinitions.rb +104 -0
  13. data/lib/taskjuggler/AlgorithmDiff.rb +2 -2
  14. data/lib/taskjuggler/Allocation.rb +1 -1
  15. data/lib/taskjuggler/AppConfig.rb +1 -1
  16. data/lib/taskjuggler/AttributeBase.rb +1 -1
  17. data/lib/taskjuggler/AttributeDefinition.rb +1 -1
  18. data/lib/taskjuggler/Attributes.rb +40 -3
  19. data/lib/taskjuggler/BatchProcessor.rb +15 -14
  20. data/lib/taskjuggler/Booking.rb +1 -1
  21. data/lib/taskjuggler/Charge.rb +2 -2
  22. data/lib/taskjuggler/ChargeSet.rb +1 -1
  23. data/lib/taskjuggler/DataCache.rb +24 -12
  24. data/lib/taskjuggler/FileList.rb +1 -1
  25. data/lib/taskjuggler/HTMLDocument.rb +1 -1
  26. data/lib/taskjuggler/HTMLElements.rb +1 -1
  27. data/lib/taskjuggler/ICalendar.rb +1 -1
  28. data/lib/taskjuggler/Interval.rb +1 -1
  29. data/lib/taskjuggler/IntervalList.rb +1 -1
  30. data/lib/taskjuggler/Journal.rb +61 -41
  31. data/lib/taskjuggler/KeywordArray.rb +1 -1
  32. data/lib/taskjuggler/KeywordDocumentation.rb +121 -33
  33. data/lib/taskjuggler/LeaveList.rb +103 -0
  34. data/lib/taskjuggler/Limits.rb +1 -1
  35. data/lib/taskjuggler/Log.rb +6 -3
  36. data/lib/taskjuggler/LogFile.rb +1 -1
  37. data/lib/taskjuggler/LogicalExpression.rb +1 -1
  38. data/lib/taskjuggler/LogicalFunction.rb +16 -2
  39. data/lib/taskjuggler/LogicalOperation.rb +3 -1
  40. data/lib/taskjuggler/MessageHandler.rb +13 -4
  41. data/lib/taskjuggler/PTNProxy.rb +118 -0
  42. data/lib/taskjuggler/Project.rb +58 -67
  43. data/lib/taskjuggler/ProjectFileParser.rb +39 -5
  44. data/lib/taskjuggler/ProjectFileScanner.rb +1 -1
  45. data/lib/taskjuggler/PropertyList.rb +26 -2
  46. data/lib/taskjuggler/PropertySet.rb +8 -1
  47. data/lib/taskjuggler/PropertyTreeNode.rb +36 -32
  48. data/lib/taskjuggler/Query.rb +1 -1
  49. data/lib/taskjuggler/RealFormat.rb +4 -2
  50. data/lib/taskjuggler/Resource.rb +3 -3
  51. data/lib/taskjuggler/ResourceScenario.rb +219 -140
  52. data/lib/taskjuggler/RichText.rb +1 -1
  53. data/lib/taskjuggler/RichText/Document.rb +2 -2
  54. data/lib/taskjuggler/RichText/Element.rb +2 -2
  55. data/lib/taskjuggler/RichText/FunctionExample.rb +2 -2
  56. data/lib/taskjuggler/RichText/FunctionHandler.rb +2 -2
  57. data/lib/taskjuggler/RichText/Parser.rb +2 -2
  58. data/lib/taskjuggler/RichText/RTFHandlers.rb +1 -1
  59. data/lib/taskjuggler/RichText/RTFNavigator.rb +1 -1
  60. data/lib/taskjuggler/RichText/RTFQuery.rb +1 -1
  61. data/lib/taskjuggler/RichText/RTFReport.rb +1 -1
  62. data/lib/taskjuggler/RichText/RTFReportLink.rb +1 -1
  63. data/lib/taskjuggler/RichText/RTFWithQuerySupport.rb +1 -1
  64. data/lib/taskjuggler/RichText/Scanner.rb +18 -4
  65. data/lib/taskjuggler/RichText/Snip.rb +2 -2
  66. data/lib/taskjuggler/RichText/SyntaxRules.rb +6 -14
  67. data/lib/taskjuggler/RichText/TOCEntry.rb +16 -7
  68. data/lib/taskjuggler/RichText/TableOfContents.rb +3 -2
  69. data/lib/taskjuggler/RuntimeConfig.rb +1 -1
  70. data/lib/taskjuggler/Scenario.rb +1 -1
  71. data/lib/taskjuggler/ScenarioData.rb +1 -1
  72. data/lib/taskjuggler/Scoreboard.rb +1 -1
  73. data/lib/taskjuggler/SheetHandlerBase.rb +1 -1
  74. data/lib/taskjuggler/SheetReceiver.rb +1 -1
  75. data/lib/taskjuggler/SheetSender.rb +3 -3
  76. data/lib/taskjuggler/Shift.rb +2 -2
  77. data/lib/taskjuggler/ShiftAssignments.rb +24 -19
  78. data/lib/taskjuggler/ShiftScenario.rb +4 -4
  79. data/lib/taskjuggler/SimpleQueryExpander.rb +1 -1
  80. data/lib/taskjuggler/StatusSheetReceiver.rb +1 -1
  81. data/lib/taskjuggler/StatusSheetSender.rb +1 -1
  82. data/lib/taskjuggler/StdIoWrapper.rb +1 -1
  83. data/lib/taskjuggler/SyntaxReference.rb +5 -2
  84. data/lib/taskjuggler/TableColumnDefinition.rb +1 -1
  85. data/lib/taskjuggler/Task.rb +4 -8
  86. data/lib/taskjuggler/TaskDependency.rb +1 -1
  87. data/lib/taskjuggler/TaskJuggler.rb +1 -1
  88. data/lib/taskjuggler/TaskScenario.rb +131 -51
  89. data/lib/taskjuggler/TernarySearchTree.rb +6 -4
  90. data/lib/taskjuggler/TextFormatter.rb +9 -2
  91. data/lib/taskjuggler/TextParser.rb +13 -3
  92. data/lib/taskjuggler/TextParser/MacroTable.rb +1 -1
  93. data/lib/taskjuggler/TextParser/Pattern.rb +52 -8
  94. data/lib/taskjuggler/TextParser/Rule.rb +11 -5
  95. data/lib/taskjuggler/TextParser/Scanner.rb +1 -1
  96. data/lib/taskjuggler/TextParser/SourceFileInfo.rb +1 -1
  97. data/lib/taskjuggler/TextParser/StackElement.rb +1 -1
  98. data/lib/taskjuggler/TextParser/State.rb +2 -2
  99. data/lib/taskjuggler/TextParser/TokenDoc.rb +1 -1
  100. data/lib/taskjuggler/TimeSheetReceiver.rb +1 -1
  101. data/lib/taskjuggler/TimeSheetSender.rb +1 -1
  102. data/lib/taskjuggler/TimeSheetSummary.rb +1 -1
  103. data/lib/taskjuggler/TimeSheets.rb +4 -6
  104. data/lib/taskjuggler/Tj3AppBase.rb +18 -1
  105. data/lib/taskjuggler/Tj3Config.rb +4 -4
  106. data/lib/taskjuggler/Tj3SheetAppBase.rb +1 -1
  107. data/lib/taskjuggler/TjException.rb +1 -1
  108. data/lib/taskjuggler/TjTime.rb +1 -1
  109. data/lib/taskjuggler/TjpExample.rb +1 -1
  110. data/lib/taskjuggler/TjpSyntaxRules.rb +920 -392
  111. data/lib/taskjuggler/URLParameter.rb +1 -1
  112. data/lib/taskjuggler/UTF8String.rb +1 -1
  113. data/lib/taskjuggler/UserManual.rb +1 -1
  114. data/lib/taskjuggler/VimSyntax.rb +9 -6
  115. data/lib/taskjuggler/WorkingHours.rb +12 -1
  116. data/lib/taskjuggler/XMLDocument.rb +1 -1
  117. data/lib/taskjuggler/XMLElement.rb +1 -1
  118. data/lib/taskjuggler/apps/Tj3.rb +8 -3
  119. data/lib/taskjuggler/apps/Tj3Client.rb +1 -1
  120. data/lib/taskjuggler/apps/Tj3Daemon.rb +1 -1
  121. data/lib/taskjuggler/apps/Tj3Man.rb +1 -1
  122. data/lib/taskjuggler/apps/Tj3SsReceiver.rb +2 -2
  123. data/lib/taskjuggler/apps/Tj3SsSender.rb +1 -1
  124. data/lib/taskjuggler/apps/Tj3TsReceiver.rb +1 -1
  125. data/lib/taskjuggler/apps/Tj3TsSender.rb +1 -1
  126. data/lib/taskjuggler/apps/Tj3TsSummary.rb +1 -1
  127. data/lib/taskjuggler/daemon/Daemon.rb +1 -1
  128. data/lib/taskjuggler/daemon/ProcessIntercom.rb +1 -1
  129. data/lib/taskjuggler/daemon/ProjectBroker.rb +1 -1
  130. data/lib/taskjuggler/daemon/ProjectServer.rb +1 -1
  131. data/lib/taskjuggler/daemon/ReportServer.rb +2 -2
  132. data/lib/taskjuggler/daemon/ReportServlet.rb +1 -1
  133. data/lib/taskjuggler/daemon/WebServer.rb +1 -1
  134. data/lib/taskjuggler/daemon/WelcomePage.rb +1 -1
  135. data/lib/taskjuggler/deep_copy.rb +1 -1
  136. data/lib/taskjuggler/reports/AccountListRE.rb +115 -0
  137. data/lib/taskjuggler/reports/CSVFile.rb +1 -1
  138. data/lib/taskjuggler/reports/CollisionDetector.rb +1 -1
  139. data/lib/taskjuggler/reports/ColumnTable.rb +1 -1
  140. data/lib/taskjuggler/reports/GanttChart.rb +1 -1
  141. data/lib/taskjuggler/reports/GanttContainer.rb +1 -3
  142. data/lib/taskjuggler/reports/GanttHeader.rb +1 -1
  143. data/lib/taskjuggler/reports/GanttHeaderScaleItem.rb +1 -1
  144. data/lib/taskjuggler/reports/GanttLine.rb +23 -12
  145. data/lib/taskjuggler/reports/GanttLoadStack.rb +1 -1
  146. data/lib/taskjuggler/reports/GanttMilestone.rb +1 -1
  147. data/lib/taskjuggler/reports/GanttRouter.rb +1 -1
  148. data/lib/taskjuggler/reports/GanttTaskBar.rb +1 -1
  149. data/lib/taskjuggler/reports/HTMLGraphics.rb +1 -1
  150. data/lib/taskjuggler/reports/ICalReport.rb +5 -2
  151. data/lib/taskjuggler/reports/Navigator.rb +1 -1
  152. data/lib/taskjuggler/reports/NikuReport.rb +1 -1
  153. data/lib/taskjuggler/reports/Report.rb +29 -4
  154. data/lib/taskjuggler/reports/ReportBase.rb +15 -1
  155. data/lib/taskjuggler/reports/ReportContext.rb +1 -1
  156. data/lib/taskjuggler/reports/ReportTable.rb +1 -1
  157. data/lib/taskjuggler/reports/ReportTableCell.rb +1 -1
  158. data/lib/taskjuggler/reports/ReportTableColumn.rb +1 -1
  159. data/lib/taskjuggler/reports/ReportTableLegend.rb +1 -1
  160. data/lib/taskjuggler/reports/ReportTableLine.rb +1 -1
  161. data/lib/taskjuggler/reports/ResourceListRE.rb +3 -5
  162. data/lib/taskjuggler/reports/StatusSheetReport.rb +2 -2
  163. data/lib/taskjuggler/reports/TableReport.rb +336 -204
  164. data/lib/taskjuggler/reports/TableReportColumn.rb +30 -0
  165. data/lib/taskjuggler/reports/TagFile.rb +2 -2
  166. data/lib/taskjuggler/reports/TaskListRE.rb +3 -6
  167. data/lib/taskjuggler/reports/TextReport.rb +1 -1
  168. data/lib/taskjuggler/reports/TimeSheetReport.rb +3 -3
  169. data/lib/taskjuggler/reports/TjpExportRE.rb +4 -1
  170. data/lib/tj3.rb +1 -1
  171. data/lib/tj3client.rb +1 -1
  172. data/lib/tj3d.rb +1 -1
  173. data/lib/tj3man.rb +1 -1
  174. data/lib/tj3ss_receiver.rb +1 -1
  175. data/lib/tj3ss_sender.rb +1 -1
  176. data/lib/tj3ts_receiver.rb +1 -1
  177. data/lib/tj3ts_sender.rb +1 -1
  178. data/lib/tj3ts_summary.rb +1 -1
  179. data/lib/updateheader.sh +4 -1
  180. data/manual/Getting_Started +7 -4
  181. data/manual/How_To_Contribute +26 -5
  182. data/manual/Installation +26 -18
  183. data/manual/Intro +55 -33
  184. data/manual/Reporting_Bugs +18 -8
  185. data/manual/Rich_Text_Attributes +16 -3
  186. data/manual/Software +2 -2
  187. data/manual/TaskJuggler_2x_Migration +2 -2
  188. data/manual/The_TaskJuggler_Syntax +10 -0
  189. data/manual/Tutorial +2 -2
  190. data/manual/html/Day_To_Day_Juggling.html +16 -12
  191. data/manual/html/Getting_Started.html +9 -7
  192. data/manual/html/How_To_Contribute.html +18 -10
  193. data/manual/html/Installation.html +18 -15
  194. data/manual/html/Intro.html +44 -28
  195. data/manual/html/Reporting_Bugs.html +9 -7
  196. data/manual/html/Rich_Text_Attributes.html +11 -8
  197. data/manual/html/Software.html +5 -5
  198. data/manual/html/TaskJuggler_2x_Migration.html +4 -4
  199. data/manual/html/TaskJuggler_Internals.html +3 -3
  200. data/manual/html/The_TaskJuggler_Syntax.html +6 -3
  201. data/manual/html/Tutorial.html +12 -12
  202. data/manual/html/account.html +19 -10
  203. data/manual/html/account.task.html +5 -28
  204. data/manual/html/accountprefix.html +5 -5
  205. data/manual/html/{report.html → accountreport.html} +140 -23
  206. data/manual/html/accountroot.html +142 -0
  207. data/manual/html/active.html +5 -5
  208. data/manual/html/adopt.task.html +7 -8
  209. data/manual/html/aggregate.html +145 -0
  210. data/manual/html/alert.html +12 -11
  211. data/manual/html/alertlevels.html +102 -0
  212. data/manual/html/allocate.html +6 -6
  213. data/manual/html/alphabet.html +1 -1
  214. data/manual/html/alternative.html +3 -3
  215. data/manual/html/author.html +3 -3
  216. data/manual/html/balance.html +84 -11
  217. data/manual/html/booking.resource.html +3 -3
  218. data/manual/html/booking.task.html +3 -3
  219. data/manual/html/caption.html +6 -4
  220. data/manual/html/cellcolor.column.html +3 -3
  221. data/manual/html/celltext.column.html +3 -3
  222. data/manual/html/center.html +28 -4
  223. data/manual/html/charge.html +3 -3
  224. data/manual/html/chargeset.html +5 -5
  225. data/manual/html/columnid.html +40 -9
  226. data/manual/html/columns.html +6 -4
  227. data/manual/html/complete.html +15 -9
  228. data/manual/html/copyright.html +5 -5
  229. data/manual/html/{credit.html → credits.html} +15 -12
  230. data/manual/html/css/tjreport.css +30 -0
  231. data/manual/html/currency.html +28 -15
  232. data/manual/html/currencyformat.html +4 -4
  233. data/manual/html/dailymax.html +3 -3
  234. data/manual/html/dailymin.html +3 -3
  235. data/manual/html/dailyworkinghours.html +3 -3
  236. data/manual/html/date.extend.html +3 -3
  237. data/manual/html/date.html +3 -3
  238. data/manual/html/definitions.html +3 -3
  239. data/manual/html/depends.html +3 -3
  240. data/manual/html/details.html +3 -3
  241. data/manual/html/disabled.html +9 -3
  242. data/manual/html/duration.html +3 -3
  243. data/manual/html/efficiency.html +3 -3
  244. data/manual/html/effort.html +3 -3
  245. data/manual/html/email.html +3 -3
  246. data/manual/html/enabled.html +9 -3
  247. data/manual/html/end.column.html +3 -3
  248. data/manual/html/end.html +3 -3
  249. data/manual/html/end.limit.html +3 -3
  250. data/manual/html/end.report.html +4 -4
  251. data/manual/html/end.timesheet.html +3 -3
  252. data/manual/html/endcredit.html +18 -9
  253. data/manual/html/epilog.html +6 -4
  254. data/manual/html/export.html +10 -6
  255. data/manual/html/extend.html +3 -3
  256. data/manual/html/fail.html +3 -3
  257. data/manual/html/fdl.html +3 -3
  258. data/manual/html/flags.account.html +3 -3
  259. data/manual/html/flags.html +3 -3
  260. data/manual/html/flags.journalentry.html +3 -3
  261. data/manual/html/flags.report.html +6 -4
  262. data/manual/html/flags.resource.html +3 -3
  263. data/manual/html/flags.statussheet.html +3 -3
  264. data/manual/html/flags.task.html +3 -3
  265. data/manual/html/flags.timesheet.html +3 -3
  266. data/manual/html/fontcolor.column.html +3 -3
  267. data/manual/html/footer.html +28 -4
  268. data/manual/html/formats.html +4 -4
  269. data/manual/html/functions.html +4 -4
  270. data/manual/html/gapduration.html +3 -3
  271. data/manual/html/gaplength.html +4 -4
  272. data/manual/html/halign.center.html +3 -3
  273. data/manual/html/halign.column.html +3 -3
  274. data/manual/html/halign.left.html +3 -3
  275. data/manual/html/halign.right.html +3 -3
  276. data/manual/html/hasalert.html +3 -3
  277. data/manual/html/header.html +28 -4
  278. data/manual/html/headline.html +6 -6
  279. data/manual/html/hideaccount.html +73 -0
  280. data/manual/html/hidejournalentry.html +6 -6
  281. data/manual/html/hidereport.html +3 -3
  282. data/manual/html/hideresource.html +4 -4
  283. data/manual/html/hidetask.html +4 -4
  284. data/manual/html/icalreport.html +3 -3
  285. data/manual/html/include.macro.html +4 -4
  286. data/manual/html/include.project.html +5 -6
  287. data/manual/html/include.properties.html +5 -97
  288. data/manual/html/index.html +2 -2
  289. data/manual/html/inherit.extend.html +3 -3
  290. data/manual/html/interval1.html +3 -3
  291. data/manual/html/interval2.html +3 -3
  292. data/manual/html/interval3.html +3 -3
  293. data/manual/html/interval4.html +3 -3
  294. data/manual/html/isactive.html +3 -3
  295. data/manual/html/ischildof.html +3 -3
  296. data/manual/html/isdependencyof.html +3 -3
  297. data/manual/html/isdutyof.html +3 -3
  298. data/manual/html/isfeatureof.html +3 -3
  299. data/manual/html/isleaf.html +3 -3
  300. data/manual/html/ismilestone.html +3 -3
  301. data/manual/html/isongoing.html +3 -3
  302. data/manual/html/isresource.html +5 -5
  303. data/manual/html/{alert level.html → isresponsibilityof.html} +19 -14
  304. data/manual/html/istask.html +5 -5
  305. data/manual/html/journalattributes.html +6 -4
  306. data/manual/html/journalentry.html +3 -3
  307. data/manual/html/journalmode.html +8 -6
  308. data/manual/html/leaveallowance.html +139 -0
  309. data/manual/html/leaves.html +140 -0
  310. data/manual/html/left.html +30 -6
  311. data/manual/html/length.html +4 -4
  312. data/manual/html/limits.allocate.html +5 -32
  313. data/manual/html/limits.html +3 -3
  314. data/manual/html/limits.resource.html +3 -3
  315. data/manual/html/limits.task.html +3 -3
  316. data/manual/html/listitem.column.html +3 -3
  317. data/manual/html/listtype.column.html +3 -3
  318. data/manual/html/loadunit.html +6 -4
  319. data/manual/html/logicalexpression.html +3 -3
  320. data/manual/html/logicalflagexpression.html +3 -3
  321. data/manual/html/macro.html +3 -3
  322. data/manual/html/managers.html +3 -3
  323. data/manual/html/mandatory.html +3 -3
  324. data/manual/html/maxend.html +3 -3
  325. data/manual/html/maximum.html +3 -3
  326. data/manual/html/maxstart.html +3 -3
  327. data/manual/html/milestone.html +3 -3
  328. data/manual/html/minend.html +3 -3
  329. data/manual/html/minimum.html +3 -3
  330. data/manual/html/minstart.html +3 -3
  331. data/manual/html/monthlymax.html +3 -3
  332. data/manual/html/monthlymin.html +3 -3
  333. data/manual/html/navbar.html +23 -5
  334. data/manual/html/navigator.html +34 -3
  335. data/manual/html/newtask.html +3 -3
  336. data/manual/html/nikureport.html +3 -3
  337. data/manual/html/note.task.html +3 -3
  338. data/manual/html/now.html +3 -3
  339. data/manual/html/numberformat.html +4 -4
  340. data/manual/html/onend.html +3 -3
  341. data/manual/html/onstart.html +3 -3
  342. data/manual/html/opennodes.html +6 -4
  343. data/manual/html/overtime.booking.html +4 -4
  344. data/manual/html/period.column.html +3 -3
  345. data/manual/html/period.limit.html +3 -3
  346. data/manual/html/period.report.html +4 -4
  347. data/manual/html/period.task.html +3 -3
  348. data/manual/html/persistent.html +3 -3
  349. data/manual/html/precedes.html +3 -3
  350. data/manual/html/priority.html +3 -3
  351. data/manual/html/priority.timesheet.html +3 -3
  352. data/manual/html/project.html +4 -4
  353. data/manual/html/projectid.html +3 -3
  354. data/manual/html/projectid.task.html +3 -3
  355. data/manual/html/projectids.html +3 -3
  356. data/manual/html/projection.html +9 -3
  357. data/manual/html/prolog.html +6 -4
  358. data/manual/html/properties.html +193 -9
  359. data/manual/html/purge.html +5 -5
  360. data/manual/html/rate.html +3 -3
  361. data/manual/html/rate.resource.html +3 -3
  362. data/manual/html/reference.extend.html +3 -3
  363. data/manual/html/remaining.html +3 -3
  364. data/manual/html/replace.html +9 -6
  365. data/manual/html/reportprefix.html +5 -5
  366. data/manual/html/resource.html +22 -4
  367. data/manual/html/resourceattributes.html +6 -6
  368. data/manual/html/resourceprefix.html +3 -3
  369. data/manual/html/resourcereport.html +311 -8
  370. data/manual/html/resourceroot.html +6 -4
  371. data/manual/html/resources.limit.html +4 -4
  372. data/manual/html/responsible.html +3 -3
  373. data/manual/html/richtext.extend.html +3 -3
  374. data/manual/html/right.html +30 -6
  375. data/manual/html/rollupaccount.html +69 -0
  376. data/manual/html/rollupresource.html +6 -6
  377. data/manual/html/rolluptask.html +4 -4
  378. data/manual/html/scale.column.html +3 -3
  379. data/manual/html/scenario.html +3 -3
  380. data/manual/html/scenario.ical.html +3 -3
  381. data/manual/html/scenarios.export.html +3 -3
  382. data/manual/html/scenarios.html +6 -4
  383. data/manual/html/scenariospecific.extend.html +3 -3
  384. data/manual/html/scheduled.html +3 -3
  385. data/manual/html/scheduling.html +3 -3
  386. data/manual/html/select.html +3 -3
  387. data/manual/html/selfcontained.html +6 -4
  388. data/manual/html/shift.allocate.html +77 -0
  389. data/manual/html/shift.html +13 -7
  390. data/manual/html/shift.resource.html +11 -5
  391. data/manual/html/shift.task.html +9 -3
  392. data/manual/html/shift.timesheet.html +4 -4
  393. data/manual/html/shifts.allocate.html +6 -6
  394. data/manual/html/shifts.resource.html +3 -3
  395. data/manual/html/shifts.task.html +3 -3
  396. data/manual/html/shorttimeformat.html +3 -3
  397. data/manual/html/sloppy.booking.html +4 -4
  398. data/manual/html/sloppy.projection.html +12 -6
  399. data/manual/html/sortaccounts.html +73 -0
  400. data/manual/html/sortjournalentries.html +8 -6
  401. data/manual/html/sortresources.html +4 -4
  402. data/manual/html/sorttasks.html +4 -4
  403. data/manual/html/start.column.html +3 -3
  404. data/manual/html/start.html +3 -3
  405. data/manual/html/start.limit.html +3 -3
  406. data/manual/html/start.report.html +4 -4
  407. data/manual/html/startcredit.html +10 -4
  408. data/manual/html/status.statussheet.html +5 -5
  409. data/manual/html/status.timesheet.html +5 -5
  410. data/manual/html/statussheet.html +3 -3
  411. data/manual/html/statussheetreport.html +10 -6
  412. data/manual/html/strict.projection.html +10 -4
  413. data/manual/html/summary.html +3 -3
  414. data/manual/html/supplement.html +5 -5
  415. data/manual/html/supplement.resource.html +22 -4
  416. data/manual/html/supplement.task.html +4 -4
  417. data/manual/html/tagfile.html +3 -3
  418. data/manual/html/task.html +3 -3
  419. data/manual/html/task.statussheet.html +3 -3
  420. data/manual/html/task.timesheet.html +3 -3
  421. data/manual/html/taskattributes.html +3 -3
  422. data/manual/html/taskprefix.html +3 -3
  423. data/manual/html/taskreport.html +347 -8
  424. data/manual/html/taskroot.html +6 -4
  425. data/manual/html/text.extend.html +3 -3
  426. data/manual/html/textreport.html +333 -8
  427. data/manual/html/timeformat.html +4 -4
  428. data/manual/html/timeoff.nikureport.html +3 -3
  429. data/manual/html/timesheet.html +3 -3
  430. data/manual/html/timesheetreport.html +10 -6
  431. data/manual/html/timezone.export.html +3 -3
  432. data/manual/html/timezone.html +3 -3
  433. data/manual/html/timezone.report.html +6 -4
  434. data/manual/html/timezone.shift.html +3 -3
  435. data/manual/html/timingresolution.html +3 -3
  436. data/manual/html/title.column.html +3 -3
  437. data/manual/html/title.html +4 -4
  438. data/manual/html/toc.html +1705 -658
  439. data/manual/html/tooltip.column.html +3 -3
  440. data/manual/html/trackingscenario.html +3 -3
  441. data/manual/html/treelevel.html +3 -3
  442. data/manual/html/vacation.html +3 -3
  443. data/manual/html/vacation.resource.html +4 -4
  444. data/manual/html/vacation.shift.html +4 -4
  445. data/manual/html/warn.html +3 -3
  446. data/manual/html/weeklymax.html +3 -3
  447. data/manual/html/weeklymin.html +3 -3
  448. data/manual/html/weekstartsmonday.html +3 -3
  449. data/manual/html/weekstartssunday.html +3 -3
  450. data/manual/html/width.column.html +3 -3
  451. data/manual/html/work.html +3 -3
  452. data/manual/html/workinghours.project.html +3 -3
  453. data/manual/html/workinghours.resource.html +3 -3
  454. data/manual/html/workinghours.shift.html +3 -3
  455. data/manual/html/yearlyworkingdays.html +4 -4
  456. data/spec/ICalendar_spec.rb +4 -2
  457. data/spec/IntervalList_spec.rb +1 -1
  458. data/spec/ProjectBroker_spec.rb +2 -6
  459. data/spec/StatusSheets_spec.rb +1 -1
  460. data/spec/TernarySearchTree_spec.rb +2 -2
  461. data/spec/TimeSheets_spec.rb +1 -1
  462. data/spec/Tj3Daemon_spec.rb +1 -1
  463. data/spec/Tj3_spec.rb +1 -1
  464. data/spec/support/DaemonControl.rb +1 -1
  465. data/spec/support/spec_helper.rb +19 -0
  466. data/taskjuggler.gemspec +1 -0
  467. data/test/MessageChecker.rb +1 -1
  468. data/test/ReferenceGenerator.rb +1 -1
  469. data/test/TestSuite/CSV-Reports/Leave.tjp +37 -0
  470. data/test/TestSuite/CSV-Reports/celltext.tjp +1 -1
  471. data/test/TestSuite/CSV-Reports/efficiency.tjp +20 -0
  472. data/test/TestSuite/CSV-Reports/headcount.tjp +31 -0
  473. data/test/TestSuite/CSV-Reports/refs/Leave.csv +5 -0
  474. data/test/TestSuite/CSV-Reports/refs/alert.csv +6 -0
  475. data/test/TestSuite/CSV-Reports/refs/celltext.csv +6 -0
  476. data/test/TestSuite/CSV-Reports/refs/efficiency.csv +5 -0
  477. data/test/TestSuite/CSV-Reports/refs/headcount.csv +4 -0
  478. data/test/TestSuite/CSV-Reports/refs/sortByTree.csv +6 -0
  479. data/test/TestSuite/CSV-Reports/refs/sortBy_duration.down.csv +6 -0
  480. data/test/TestSuite/CSV-Reports/refs/sortBy_effort.up.csv +6 -0
  481. data/test/TestSuite/CSV-Reports/refs/sortBy_plan.start.down.csv +6 -0
  482. data/test/TestSuite/CSV-Reports/refs/taskreport.csv +6 -0
  483. data/test/TestSuite/CSV-Reports/refs/taskreport_with_resources.csv +14 -0
  484. data/test/TestSuite/CSV-Reports/resourcereport.tjp +1 -1
  485. data/test/TestSuite/CSV-Reports/resourcereport_with_tasks.tjp +1 -1
  486. data/test/TestSuite/CSV-Reports/sortByTree.tjp +1 -1
  487. data/test/TestSuite/CSV-Reports/sortBy_plan.start.down.tjp +1 -1
  488. data/test/TestSuite/CSV-Reports/taskreport.tjp +1 -1
  489. data/test/TestSuite/CSV-Reports/taskreport_with_resources.tjp +1 -1
  490. data/test/TestSuite/Export-Reports/refs/AccountReport.tjp +1089 -0
  491. data/test/TestSuite/Export-Reports/refs/AlertLevels.tjp +24 -0
  492. data/test/TestSuite/Export-Reports/refs/Complete.tjp +5 -25
  493. data/test/TestSuite/Export-Reports/refs/navigator.tjp +58 -0
  494. data/test/TestSuite/Export-Reports/refs/template.tjp +142 -0
  495. data/test/TestSuite/Export-Reports/refs/textreport.tjp +19 -0
  496. data/test/TestSuite/ReportGenerator/Correct/Alerts.tjp +26 -7
  497. data/test/TestSuite/ReportGenerator/Correct/refs/Alerts-1.csv +177 -141
  498. data/test/TestSuite/ReportGenerator/Correct/refs/FTE-1.csv +1 -1
  499. data/test/TestSuite/Scheduler/Correct/Allocate.tjp +2 -2
  500. data/test/TestSuite/Scheduler/Correct/Shift2.tjp +4 -4
  501. data/test/TestSuite/Syntax/Correct/Account.tjp +23 -10
  502. data/test/TestSuite/Syntax/Correct/AccountReport.tjp +74 -0
  503. data/test/TestSuite/Syntax/Correct/AdoptedTasks.tjp +4 -0
  504. data/test/TestSuite/Syntax/Correct/AlertLevels.tjp +25 -0
  505. data/test/TestSuite/Syntax/Correct/Celltext.tjp +3 -3
  506. data/test/TestSuite/Syntax/Correct/Complete.tjp +8 -5
  507. data/test/TestSuite/Syntax/Correct/Leave.tjp +37 -0
  508. data/test/TestSuite/Syntax/Correct/Reports.tjp +4 -4
  509. data/test/TestSuite/Syntax/Correct/Shift.tjp +4 -4
  510. data/test/TestSuite/Syntax/Correct/manual2example.rb +4 -3
  511. data/test/TestSuite/Syntax/Correct/navigator.tjp +31 -0
  512. data/test/TestSuite/Syntax/Correct/template.tjp +338 -0
  513. data/test/TestSuite/Syntax/Correct/textreport.tjp +21 -0
  514. data/test/TestSuite/Syntax/Correct/tutorial.tjp +12 -10
  515. data/test/TestSuite/Syntax/Errors/{adopt_duplicate_child.tjp → adopt_duplicate_child-1.tjp} +0 -0
  516. data/test/TestSuite/Syntax/Errors/{adopt_common_root.tjp → adopt_duplicate_child-2.tjp} +1 -1
  517. data/test/TestSuite/Syntax/Errors/{adopt_duplicate_parent.tjp → adopt_duplicate_child-3.tjp} +1 -1
  518. data/test/TestSuite/Syntax/Errors/adopt_self.tjp +7 -0
  519. data/test/TestSuite/Syntax/Errors/alert_level_redef.tjp +8 -0
  520. data/test/TestSuite/Syntax/Errors/alert_name_redef.tjp +8 -0
  521. data/test/TestSuite/Syntax/Errors/too_few_alert_levels.tjp +5 -0
  522. data/test/TjpGen.rb +1 -1
  523. data/test/all.rb +1 -1
  524. data/test/test_AlgorithmDiff.rb +1 -1
  525. data/test/test_BatchProcessor.rb +23 -10
  526. data/test/test_CSV-Reports.rb +1 -1
  527. data/test/test_CSVFile.rb +1 -1
  528. data/test/test_CollisionDetector.rb +1 -1
  529. data/test/test_Export-Reports.rb +1 -1
  530. data/test/test_Journal.rb +42 -15
  531. data/test/test_Limits.rb +1 -1
  532. data/test/test_LogicalExpression.rb +1 -1
  533. data/test/test_MacroTable.rb +8 -3
  534. data/test/test_Project.rb +1 -1
  535. data/test/test_ProjectFileScanner.rb +1 -1
  536. data/test/test_PropertySet.rb +1 -1
  537. data/test/test_Query.rb +1 -1
  538. data/test/test_RealFormat.rb +1 -1
  539. data/test/test_ReportGenerator.rb +1 -1
  540. data/test/test_RichText.rb +1 -1
  541. data/test/test_Scheduler.rb +1 -1
  542. data/test/test_ShiftAssignments.rb +1 -1
  543. data/test/test_SimpleQueryExpander.rb +1 -1
  544. data/test/test_Syntax.rb +1 -1
  545. data/test/test_TextFormatter.rb +1 -1
  546. data/test/test_TjTime.rb +1 -1
  547. data/test/test_TjpExample.rb +1 -1
  548. data/test/test_URLParameter.rb +1 -1
  549. data/test/test_UTF8String.rb +1 -1
  550. data/test/test_WorkingHours.rb +1 -1
  551. data/test/test_deep_copy.rb +1 -1
  552. metadata +318 -248
  553. data/test/TestSuite/Syntax/Errors/purge_no_list.tjp +0 -8
data/manual/html/columnid.html CHANGED
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <!-- This file has been generated by tj3man v3.0.0 -->
3
+ <!-- This file has been generated by tj3man v3.1.0 -->
4
4
  <html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
5
5
  <head>
6
6
  <title>columnid</title>
@@ -11,7 +11,7 @@
11
11
  <link href="css/tjmanual.css" rel="stylesheet" type="text/css"></link>
12
12
  <body>
13
13
  <div align="center">
14
- <h3 align="center">The TaskJuggler III User Manual</h3>
14
+ <h3 align="center">The TaskJuggler User Manual</h3>
15
15
  <em align="center">Project Management beyond Gantt Chart Drawing</em>
16
16
  </div>
17
17
  <br/>
@@ -40,10 +40,18 @@
40
40
  </tr>
41
41
  <tr align="left">
42
42
  <td class="tag">Syntax</td>
43
- <td class="descr" colspan="2"><code>(alert | alertmessages | alertsummaries | alerttrend | chart | complete | completed | criticalness | cost | daily | directreports | duration | duties | efficiency | effort | effortdone | effortleft | email | end | flags | followers | freetime | freework | fte | headcount | hierarchindex | hourly | id | index | inputs | journal | journal_sub | journalmessages | journalsummaries | line | managers | maxend | maxstart | minend | minstart | monthly | no | name | note | pathcriticalness | precursors | priority | quarterly | rate | reports | resources | responsible | revenue | scenario | seqno | start | status | targets | wbs | bsi | weekly | yearly)</code></td>
43
+ <td class="descr" colspan="2"><code>(annualleave | annualleavebalance | alert | alertmessages | alertsummaries | alerttrend | balance | bsi | chart | complete | completed | criticalness | cost | daily | directreports | duration | duties | efficiency | effort | effortdone | effortleft | email | end | flags | followers | freetime | freework | fte | gauge | headcount | hierarchindex | hourly | id | index | inputs | journal | journal_sub | journalmessages | journalsummaries | line | managers | maxend | maxstart | minend | minstart | monthly | no | name | note | pathcriticalness | precursors | priority | quarterly | rate | reports | resources | responsible | revenue | scenario | seqno | sickleave | specialleave | start | status | targets | wbs | unpaidleave | weekly | yearly)</code></td>
44
+ </tr>
45
+ <tr align="left">
46
+ <td class="tag" rowspan="69">Arguments</td>
47
+ <td class="descr">annualleave</td>
48
+ <td class="descr"><div>The number of annual leave units within the reported time period. The unit can be adjusted with <a href="loadunit.html">loadunit</a>.</div></td>
49
+ </tr>
50
+ <tr align="left">
51
+ <td class="descr">annualleavebalance</td>
52
+ <td class="descr"><div>The balance of the annual leave at the end of the reporting interval. The unit can be adjusted with <a href="loadunit.html">loadunit</a>.</div></td>
44
53
  </tr>
45
54
  <tr align="left">
46
- <td class="tag" rowspan="62">Arguments</td>
47
55
  <td class="descr">alert</td>
48
56
  <td class="descr"><div>The alert level of the property that was reported with the date closest to the end date of the report. Container properties that don't have their own alert level reported with a date equal or newer than the alert levels of all their sub properties will get the highest alert level of their direct sub properties.</div></td>
49
57
  </tr>
@@ -59,6 +67,14 @@
59
67
  <td class="descr">alerttrend</td>
60
68
  <td class="descr"><div>Shows how the alert level at the end of the report period compares to the alert level at the begining of the report period. Possible values are up, down or flat.</div></td>
61
69
  </tr>
70
+ <tr align="left">
71
+ <td class="descr">balance</td>
72
+ <td class="descr"><div>The account balance at the beginning of the reported period.</div></td>
73
+ </tr>
74
+ <tr align="left">
75
+ <td class="descr">bsi</td>
76
+ <td class="descr"><div>The hierarchical or work breakdown structure index (i. e. 1.2.3)</div></td>
77
+ </tr>
62
78
  <tr align="left">
63
79
  <td class="descr">chart</td>
64
80
  <td class="descr"><div>A Gantt chart. This column type requires all lines to have the same fixed height. This does not work well with rich text columns in some browsers. Some show a scrollbar for the compressed table cells, others don't. It is recommended, that you don't use rich text columns in conjuction with the chart column.</div></td>
@@ -153,11 +169,18 @@
153
169
  </tr>
154
170
  <tr align="left">
155
171
  <td class="descr">fte</td>
156
- <td class="descr"><div>The Full-Time-Equivalent of a resource or group. This is the ratio of the resource working time and the global working time. Working time is defined by working hours and vacations. The FTE value can vary over time and is calculated for the report interval or the user specified interval.</div></td>
172
+ <td class="descr"><div>The Full-Time-Equivalent of a resource or group. This is the ratio of the resource working time and the global working time. Working time is defined by working hours and leaves. The FTE value can vary over time and is calculated for the report interval or the user specified interval.</div></td>
173
+ </tr>
174
+ <tr align="left">
175
+ <td class="descr">gauge</td>
176
+ <td class="descr"><div>When <a href="complete.html">complete</a> values have been provided to capture the actual progress on tasks, the gauge column will list whether the task is ahead of, behind or on schedule.</div></td>
157
177
  </tr>
158
178
  <tr align="left">
159
179
  <td class="descr">headcount</td>
160
- <td class="descr"><div>The headcount number of the resource or group</div></td>
180
+ <td class="descr"><div>
181
+ <p>For resources this is the headcount number of the resource or resource group. For a single resource this is the <a href="efficiency.html">efficiency</a> rounded to the next integer. For a group it is the sum of the sub resources headcount.</p>
182
+ <p>For tasks it's the number of different resources allocated to the task during the report interval. Resources are weighted with their rounded efficiencies.</p>
183
+ </div></td>
161
184
  </tr>
162
185
  <tr align="left">
163
186
  <td class="descr">hierarchindex</td>
@@ -307,6 +330,14 @@
307
330
  <td class="descr">seqno</td>
308
331
  <td class="descr"><div>The index of the item based on the declaration order</div></td>
309
332
  </tr>
333
+ <tr align="left">
334
+ <td class="descr">sickleave</td>
335
+ <td class="descr"><div>The number of sick leave units within the reported time period. The unit can be adjusted with <a href="loadunit.html">loadunit</a>.</div></td>
336
+ </tr>
337
+ <tr align="left">
338
+ <td class="descr">specialleave</td>
339
+ <td class="descr"><div>The number of special leave units within the reported time period. The unit can be adjusted with <a href="loadunit.html">loadunit</a>.</div></td>
340
+ </tr>
310
341
  <tr align="left">
311
342
  <td class="descr">start</td>
312
343
  <td class="descr"><div>The start date of the task</div></td>
@@ -327,8 +358,8 @@
327
358
  <td class="descr"><div>Deprecated alias for bsi.</div></td>
328
359
  </tr>
329
360
  <tr align="left">
330
- <td class="descr">bsi</td>
331
- <td class="descr"><div>The hierarchical or work breakdown structure index</div></td>
361
+ <td class="descr">unpaidleave</td>
362
+ <td class="descr"><div>The number of unpaid leave units within the reported time period. The unit can be adjusted with <a href="loadunit.html">loadunit</a>.</div></td>
332
363
  </tr>
333
364
  <tr align="left">
334
365
  <td class="descr">weekly</td>
@@ -353,6 +384,6 @@
353
384
  </tr></table>
354
385
  <hr/>
355
386
  <br/>
356
- <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
387
+ <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
357
388
  </body>
358
389
  </html>
data/manual/html/columns.html CHANGED
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <!-- This file has been generated by tj3man v3.0.0 -->
3
+ <!-- This file has been generated by tj3man v3.1.0 -->
4
4
  <html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
5
5
  <head>
6
6
  <title>columns</title>
@@ -11,7 +11,7 @@
11
11
  <link href="css/tjmanual.css" rel="stylesheet" type="text/css"></link>
12
12
  <body>
13
13
  <div align="center">
14
- <h3 align="center">The TaskJuggler III User Manual</h3>
14
+ <h3 align="center">The TaskJuggler User Manual</h3>
15
15
  <em align="center">Project Management beyond Gantt Chart Drawing</em>
16
16
  </div>
17
17
  <br/>
@@ -49,7 +49,9 @@
49
49
  </tr>
50
50
  <tr align="left">
51
51
  <td class="tag">Context</td>
52
- <td class="descr" colspan="2"><a href="report.html">report</a></td>
52
+ <td class="descr" colspan="2">
53
+ <a href="accountreport.html">accountreport</a>, <a href="resourcereport.html">resourcereport</a>, <a href="taskreport.html">taskreport</a>, <a href="textreport.html">textreport</a>
54
+ </td>
53
55
  </tr>
54
56
  </table></p>
55
57
  <p><table align="center" class="table"><tr align="left">
@@ -68,6 +70,6 @@
68
70
  </tr></table>
69
71
  <hr/>
70
72
  <br/>
71
- <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
73
+ <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
72
74
  </body>
73
75
  </html>
data/manual/html/complete.html CHANGED
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <!-- This file has been generated by tj3man v3.0.0 -->
3
+ <!-- This file has been generated by tj3man v3.1.0 -->
4
4
  <html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
5
5
  <head>
6
6
  <title>complete</title>
@@ -11,7 +11,7 @@
11
11
  <link href="css/tjmanual.css" rel="stylesheet" type="text/css"></link>
12
12
  <body>
13
13
  <div align="center">
14
- <h3 align="center">The TaskJuggler III User Manual</h3>
14
+ <h3 align="center">The TaskJuggler User Manual</h3>
15
15
  <em align="center">Project Management beyond Gantt Chart Drawing</em>
16
16
  </div>
17
17
  <br/>
@@ -36,7 +36,10 @@
36
36
  </colgroup>
37
37
  <tr align="left">
38
38
  <td class="tag">Purpose</td>
39
- <td class="descr" colspan="2"><div>Specifies what percentage of the task is already completed. This can be useful for project tracking. Reports with calendar elements may show the completed part of the task in a different color. The completion percentage has no impact on the scheduler. It's meant for documentation purposes only. Tasks may not have subtasks if this attribute is used.</div></td>
39
+ <td class="descr" colspan="2"><div>
40
+ <p>Specifies what percentage of the task is already completed. This can be useful for simple progress tracking like in a TODO list. The provided completion degree is used for the <code>complete</code> and <code>gauge</code> columns in reports. Reports with calendar elements may show the completed part of the task in a different color.</p>
41
+ <p>The completion percentage has no impact on the scheduler. It's meant for documentation purposes only.</p>
42
+ </div></td>
40
43
  </tr>
41
44
  <tr align="left">
42
45
  <td class="tag">Syntax</td>
@@ -54,16 +57,19 @@
54
57
  </td>
55
58
  </tr>
56
59
  </table></p>
57
- <div class="codeframe"><pre class="code">resource tux "Tux"
58
-
59
- task t "Task" {
60
+ <div class="codeframe"><pre class="code">
61
+ task "Build house" {
60
62
  start 2007-01-06
61
- effort 10d
62
- allocate tux
63
+ duration 30d
63
64
  # This task should have been completed on Jan 15, but only
64
65
  # 20% of the task have been completed so far.
65
66
  complete 20
66
67
  }
68
+
69
+ taskreport "Complete" {
70
+ formats html
71
+ columns name, end { title "Due date" }, complete, gauge, chart
72
+ }
67
73
  </pre></div>
68
74
  </div>
69
75
  <br/>
@@ -75,6 +81,6 @@ task t "Task" {
75
81
  </tr></table>
76
82
  <hr/>
77
83
  <br/>
78
- <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
84
+ <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
79
85
  </body>
80
86
  </html>
data/manual/html/copyright.html CHANGED
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <!-- This file has been generated by tj3man v3.0.0 -->
3
+ <!-- This file has been generated by tj3man v3.1.0 -->
4
4
  <html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
5
5
  <head>
6
6
  <title>copyright</title>
@@ -11,7 +11,7 @@
11
11
  <link href="css/tjmanual.css" rel="stylesheet" type="text/css"></link>
12
12
  <body>
13
13
  <div align="center">
14
- <h3 align="center">The TaskJuggler III User Manual</h3>
14
+ <h3 align="center">The TaskJuggler User Manual</h3>
15
15
  <em align="center">Project Management beyond Gantt Chart Drawing</em>
16
16
  </div>
17
17
  <br/>
@@ -19,7 +19,7 @@
19
19
  <table style="width:90%; margin-left:5%; margin-right:5%"><tr>
20
20
  <td style="text-align:left; width:35%;">&lt;&lt; <a href="complete.html">complete</a> &lt;&lt;</td>
21
21
  <td style="text-align:center; width:30%;"><a href="toc.html">Table Of Contents</a></td>
22
- <td style="text-align:right; width:35%;">&gt;&gt; <a href="credit.html">credit</a> &gt;&gt;</td>
22
+ <td style="text-align:right; width:35%;">&gt;&gt; <a href="credits.html">credits</a> &gt;&gt;</td>
23
23
  </tr></table>
24
24
  <hr/>
25
25
  <br/>
@@ -88,10 +88,10 @@ taskreport planttree "PlantTree.html" {
88
88
  <table style="width:90%; margin-left:5%; margin-right:5%"><tr>
89
89
  <td style="text-align:left; width:35%;">&lt;&lt; <a href="complete.html">complete</a> &lt;&lt;</td>
90
90
  <td style="text-align:center; width:30%;"><a href="toc.html">Table Of Contents</a></td>
91
- <td style="text-align:right; width:35%;">&gt;&gt; <a href="credit.html">credit</a> &gt;&gt;</td>
91
+ <td style="text-align:right; width:35%;">&gt;&gt; <a href="credits.html">credits</a> &gt;&gt;</td>
92
92
  </tr></table>
93
93
  <hr/>
94
94
  <br/>
95
- <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
95
+ <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
96
96
  </body>
97
97
  </html>
data/manual/html/{credit.html → credits.html} RENAMED
@@ -1,9 +1,9 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <!-- This file has been generated by tj3man v3.0.0 -->
3
+ <!-- This file has been generated by tj3man v3.1.0 -->
4
4
  <html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
5
5
  <head>
6
- <title>credit</title>
6
+ <title>credits</title>
7
7
  <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
8
8
  <meta content="The TaskJuggler Manual" name="description"/>
9
9
  <meta content="taskjuggler, project, management" name="keywords"/>
@@ -11,7 +11,7 @@
11
11
  <link href="css/tjmanual.css" rel="stylesheet" type="text/css"></link>
12
12
  <body>
13
13
  <div align="center">
14
- <h3 align="center">The TaskJuggler III User Manual</h3>
14
+ <h3 align="center">The TaskJuggler User Manual</h3>
15
15
  <em align="center">Project Management beyond Gantt Chart Drawing</em>
16
16
  </div>
17
17
  <br/>
@@ -26,7 +26,7 @@
26
26
  <div style="margin-left:5%; margin-right:5%">
27
27
  <p><table align="center" class="table"><tr align="left">
28
28
  <td class="tag" style="width:16%">Keyword</td>
29
- <td class="descr" style="width:84%; font-weight:bold">credit</td>
29
+ <td class="descr" style="width:84%; font-weight:bold">credits</td>
30
30
  </tr></table></p>
31
31
  <p><table align="center" class="table">
32
32
  <colgroup>
@@ -36,11 +36,11 @@
36
36
  </colgroup>
37
37
  <tr align="left">
38
38
  <td class="tag">Purpose</td>
39
- <td class="descr" colspan="2"><div>Book the specified amount to the account at the specified date.</div></td>
39
+ <td class="descr" colspan="2"><div>Book the specified amounts to the account at the specified date. The desciptions are just used for documentary purposes.</div></td>
40
40
  </tr>
41
41
  <tr align="left">
42
42
  <td class="tag">Syntax</td>
43
- <td class="descr" colspan="2"><code>credit &lt;date&gt; &lt;description&gt; &lt;amount&gt;</code></td>
43
+ <td class="descr" colspan="2"><code>credits &lt;date&gt; &lt;description&gt; &lt;amount&gt; [, &lt;date&gt; &lt;description&gt; &lt;amount&gt;...]</code></td>
44
44
  </tr>
45
45
  <tr align="left">
46
46
  <td class="tag" rowspan="3">Arguments</td>
@@ -62,9 +62,12 @@
62
62
  </table></p>
63
63
  <div class="codeframe"><pre class="code">account project_cost "Project Costs"
64
64
  account payments "Customer Payments"{
65
- credit 2007-01-08 "Customer down payment" 500.0
65
+ credits 2007-01-01 "Customer down payment" 500.0,
66
+ 2007-01-14 "1st rate" 2000.0
66
67
  }
67
68
 
69
+ balance project_cost payments
70
+
68
71
  resource tux "Tux" {
69
72
  rate 300
70
73
  }
@@ -75,11 +78,11 @@ resource konqui "Konqui" {
75
78
  task items "Room decoration" {
76
79
  start 2007-01-06
77
80
  # The default account for all tasks
78
- account project_cost
81
+ chargeset project_cost
79
82
 
80
83
  task plan "Plan work and buy material" {
81
84
  # Upfront material cost
82
- startcredit 500.0
85
+ charge 500.0 onstart
83
86
  length 2d
84
87
  }
85
88
  task remove "Remove old inventory" {
@@ -96,9 +99,9 @@ task items "Room decoration" {
96
99
  task acceptance "Presentation and customer acceptance" {
97
100
  duration 5d
98
101
  depends !implement
99
- account payments
102
+ chargeset payments
100
103
  # Customer pays at end of acceptance
101
- endcredit 2000.0
104
+ charge 2000.0 onend
102
105
  }
103
106
  }
104
107
  </pre></div>
@@ -112,6 +115,6 @@ task items "Room decoration" {
112
115
  </tr></table>
113
116
  <hr/>
114
117
  <br/>
115
- <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
118
+ <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
116
119
  </body>
117
120
  </html>
data/manual/html/css/tjreport.css CHANGED
@@ -297,6 +297,36 @@ p.tj_journal {
297
297
  overflow:hidden;
298
298
  padding:0px;
299
299
  }
300
+ .costaccountcell1 {
301
+ background-color:#fff2eb;
302
+ white-space:nowrap;
303
+ padding:0px;
304
+ }
305
+ .costaccountcell2 {
306
+ background-color:#ebdfd9;
307
+ white-space:nowrap;
308
+ padding:0px;
309
+ }
310
+ .revenueaccountcell1 {
311
+ background-color:#cbffcc;
312
+ white-space:nowrap;
313
+ padding:0px;
314
+ }
315
+ .revenueaccountcell2 {
316
+ background-color:#a6d0a6;
317
+ white-space:nowrap;
318
+ padding:0px;
319
+ }
320
+ .accountcell1 {
321
+ background-color:#ebf2ff;
322
+ white-space:nowrap;
323
+ padding:0px;
324
+ }
325
+ .accountcell2 {
326
+ background-color:#d9dfeb;
327
+ white-space:nowrap;
328
+ padding:0px;
329
+ }
300
330
  .taskcell1 {
301
331
  background-color:#ebf2ff;
302
332
  white-space:nowrap;
data/manual/html/currency.html CHANGED
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <!-- This file has been generated by tj3man v3.0.0 -->
3
+ <!-- This file has been generated by tj3man v3.1.0 -->
4
4
  <html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
5
5
  <head>
6
6
  <title>currency</title>
@@ -11,13 +11,13 @@
11
11
  <link href="css/tjmanual.css" rel="stylesheet" type="text/css"></link>
12
12
  <body>
13
13
  <div align="center">
14
- <h3 align="center">The TaskJuggler III User Manual</h3>
14
+ <h3 align="center">The TaskJuggler User Manual</h3>
15
15
  <em align="center">Project Management beyond Gantt Chart Drawing</em>
16
16
  </div>
17
17
  <br/>
18
18
  <hr/>
19
19
  <table style="width:90%; margin-left:5%; margin-right:5%"><tr>
20
- <td style="text-align:left; width:35%;">&lt;&lt; <a href="credit.html">credit</a> &lt;&lt;</td>
20
+ <td style="text-align:left; width:35%;">&lt;&lt; <a href="credits.html">credits</a> &lt;&lt;</td>
21
21
  <td style="text-align:center; width:30%;"><a href="toc.html">Table Of Contents</a></td>
22
22
  <td style="text-align:right; width:35%;">&gt;&gt; <a href="currencyformat.html">currencyformat</a> &gt;&gt;</td>
23
23
  </tr></table>
@@ -59,9 +59,12 @@
59
59
 
60
60
  account project_cost "Project Costs"
61
61
  account payments "Customer Payments"{
62
- credit 2007-01-08 "Customer down payment" 500.0
62
+ credits 2007-01-01 "Customer down payment" 500.0,
63
+ 2007-01-14 "1st rate" 2000.0
63
64
  }
64
65
 
66
+ balance project_cost payments
67
+
65
68
  resource tux "Tux" {
66
69
  rate 300
67
70
  }
@@ -72,11 +75,11 @@ resource konqui "Konqui" {
72
75
  task items "Room decoration" {
73
76
  start 2007-01-06
74
77
  # The default account for all tasks
75
- account project_cost
78
+ chargeset project_cost
76
79
 
77
80
  task plan "Plan work and buy material" {
78
81
  # Upfront material cost
79
- startcredit 500.0
82
+ charge 500.0 onstart
80
83
  length 2d
81
84
  }
82
85
  task remove "Remove old inventory" {
@@ -93,28 +96,38 @@ task items "Room decoration" {
93
96
  task acceptance "Presentation and customer acceptance" {
94
97
  duration 5d
95
98
  depends !implement
96
- account payments
99
+ chargeset payments
97
100
  # Customer pays at end of acceptance
98
- endcredit 2000.0
101
+ charge 2000.0 onend
99
102
  }
100
103
  }
101
104
 
102
- # accountreport pandl "PAndL.html" {
103
- # timeformat "%d-%M-%y"
104
- # accumulate
105
- # columns index, name, weekly
106
- # }
105
+ accountreport "Account-1" {
106
+ formats html
107
+ timeformat "%d-%M-%y"
108
+ columns index, name, weekly
109
+ }
110
+
111
+ accountreport "Account-2" {
112
+ formats html
113
+ timeformat "%d-%M-%y"
114
+ columns index,
115
+ name,
116
+ weekly {
117
+ celltext 1 "&lt;-query attribute='turnover'-&gt;"
118
+ }
119
+ }
107
120
  </pre></div>
108
121
  </div>
109
122
  <br/>
110
123
  <hr/>
111
124
  <table style="width:90%; margin-left:5%; margin-right:5%"><tr>
112
- <td style="text-align:left; width:35%;">&lt;&lt; <a href="credit.html">credit</a> &lt;&lt;</td>
125
+ <td style="text-align:left; width:35%;">&lt;&lt; <a href="credits.html">credits</a> &lt;&lt;</td>
113
126
  <td style="text-align:center; width:30%;"><a href="toc.html">Table Of Contents</a></td>
114
127
  <td style="text-align:right; width:35%;">&gt;&gt; <a href="currencyformat.html">currencyformat</a> &gt;&gt;</td>
115
128
  </tr></table>
116
129
  <hr/>
117
130
  <br/>
118
- <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
131
+ <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
119
132
  </body>
120
133
  </html>