From dc8870ec9e72ab92823b235995a67a5912558eb8 Mon Sep 17 00:00:00 2001 From: Jostein Berntsen Date: Thu, 27 Mar 2014 17:54:21 +0100 Subject: [PATCH 1/7] Signed-off-by: Jostein Berntsen fix: In Windows and Cygwin generate file path for the booking file is wrong Reported-by: Yury Rumega When running the freeze command in Windows and Cygwin file path for the booking file is generated wrongly. --- lib/taskjuggler/reports/Report.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/taskjuggler/reports/Report.rb b/lib/taskjuggler/reports/Report.rb index 772d711a..968e03a5 100644 --- a/lib/taskjuggler/reports/Report.rb +++ b/lib/taskjuggler/reports/Report.rb @@ -297,7 +297,7 @@ def generateTJP if @name == '.' $stdout.write(@content.to_tjp) else - fileName = absoluteFileName(@name) + fileName = @name fileName += a('definitions').include?('project') ? '.tjp' : '.tji' File.open(fileName, 'w') { |f| f.write(@content.to_tjp) } end From 163fabe4f21b92a9828f65ccd186526af6c3b401 Mon Sep 17 00:00:00 2001 From: Jostein Berntsen Date: Thu, 27 Mar 2014 18:26:55 +0100 Subject: [PATCH 2/7] Signed-off-by: Jostein Berntsen Corrected some words. --- manual/Day_To_Day_Juggling | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manual/Day_To_Day_Juggling b/manual/Day_To_Day_Juggling index 21e60dbb..a01ab787 100644 --- a/manual/Day_To_Day_Juggling +++ b/manual/Day_To_Day_Juggling @@ -257,7 +257,7 @@ as HTML pages from a web server. === Implementing the status tracking system === -==== Prerequesites ==== +==== Prerequisites ==== The .tjp and .tji files of your project plan should be managed by a revision control system. TaskJuggler does not require a particular @@ -285,7 +285,7 @@ For the email based communication you need to provide email addresses for all project contributors. This is done in the project plan in the resource definition by using the [[email]] attribute. - resource joe "Joe Avergage" { + resource joe "Joe Average" { email "joe@your_company.com } @@ -372,7 +372,7 @@ To test the command without sending out actual emails you can use the directories. A copy of the generated templates will be stored in ''''TimeSheetTemplates//'''' under ''''-date.tji''''. '''''''' is replaced with the -end date of the reporting interval and '''''''' is the ID +end date of the reporting interval and '''''''' is the ID of the resource. If you re-run the command existing templates will not be regenerated @@ -380,7 +380,7 @@ nor will they be sent out again. You can use the ''''-f'''' command line option to force them to be generated and sent out again. The ''''tj3ts_sender'''' command will also add the reporting interval -to a file called ''''TimeSheetTemplates/acceptable_invervals''''. +to a file called ''''TimeSheetTemplates/acceptable_intervals''''. We'll cover this file later on when we deal with the time sheet receiver. @@ -490,7 +490,7 @@ the taskjuggler home directory, you need to create it now. This procmail configuration will cause incoming emails that are addressed to timesheets@taskjuggler.your_company.com to be forwarded to the ''''tj3ts_receiver'''' program. Of course you need to replace -''your_comany.com'' with whatever domain you are using. +''your_company.com'' with whatever domain you are using. The received emails are then checked for syntactical and logical errors. If such are found, an email is sent back with an appropriate @@ -751,7 +751,7 @@ used. It will use the ''''tj3client'''' program to do retrieve the necessary data from the TaskJuggler server. Before the program can be used, a new section must be added to the -TaskJuggelr configuration file. +TaskJuggler configuration file. _statussheets: projectId: prj @@ -764,7 +764,7 @@ can hardcode that like in the example above. For multiple level of management you need to specify which group of managers should the report templates be generated for and pass that information on the command line. Use the ''''--hideresource'''' option to specify a -logicalexpression to filter away the resources you don't want +logical expression to filter away the resources you don't want templates to be generated for. The easiest way to achieve this is by using unique flags for each management level. In the example above we assume you have assigned the flag ''''manager'''' to each first-level From 3ca91860374adefb5821ab70d1a3030883459231 Mon Sep 17 00:00:00 2001 From: Jostein Berntsen Date: Sun, 6 Apr 2014 22:36:53 +0200 Subject: [PATCH 3/7] Revert "Signed-off-by: Jostein Berntsen " This reverts commit 163fabe4f21b92a9828f65ccd186526af6c3b401. --- manual/Day_To_Day_Juggling | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manual/Day_To_Day_Juggling b/manual/Day_To_Day_Juggling index a01ab787..21e60dbb 100644 --- a/manual/Day_To_Day_Juggling +++ b/manual/Day_To_Day_Juggling @@ -257,7 +257,7 @@ as HTML pages from a web server. === Implementing the status tracking system === -==== Prerequisites ==== +==== Prerequesites ==== The .tjp and .tji files of your project plan should be managed by a revision control system. TaskJuggler does not require a particular @@ -285,7 +285,7 @@ For the email based communication you need to provide email addresses for all project contributors. This is done in the project plan in the resource definition by using the [[email]] attribute. - resource joe "Joe Average" { + resource joe "Joe Avergage" { email "joe@your_company.com } @@ -372,7 +372,7 @@ To test the command without sending out actual emails you can use the directories. A copy of the generated templates will be stored in ''''TimeSheetTemplates//'''' under ''''-date.tji''''. '''''''' is replaced with the -end date of the reporting interval and '''''''' is the ID +end date of the reporting interval and '''''''' is the ID of the resource. If you re-run the command existing templates will not be regenerated @@ -380,7 +380,7 @@ nor will they be sent out again. You can use the ''''-f'''' command line option to force them to be generated and sent out again. The ''''tj3ts_sender'''' command will also add the reporting interval -to a file called ''''TimeSheetTemplates/acceptable_intervals''''. +to a file called ''''TimeSheetTemplates/acceptable_invervals''''. We'll cover this file later on when we deal with the time sheet receiver. @@ -490,7 +490,7 @@ the taskjuggler home directory, you need to create it now. This procmail configuration will cause incoming emails that are addressed to timesheets@taskjuggler.your_company.com to be forwarded to the ''''tj3ts_receiver'''' program. Of course you need to replace -''your_company.com'' with whatever domain you are using. +''your_comany.com'' with whatever domain you are using. The received emails are then checked for syntactical and logical errors. If such are found, an email is sent back with an appropriate @@ -751,7 +751,7 @@ used. It will use the ''''tj3client'''' program to do retrieve the necessary data from the TaskJuggler server. Before the program can be used, a new section must be added to the -TaskJuggler configuration file. +TaskJuggelr configuration file. _statussheets: projectId: prj @@ -764,7 +764,7 @@ can hardcode that like in the example above. For multiple level of management you need to specify which group of managers should the report templates be generated for and pass that information on the command line. Use the ''''--hideresource'''' option to specify a -logical expression to filter away the resources you don't want +logicalexpression to filter away the resources you don't want templates to be generated for. The easiest way to achieve this is by using unique flags for each management level. In the example above we assume you have assigned the flag ''''manager'''' to each first-level From d3c9d87a4fd58c9af15a44eb6c2b6c131f939912 Mon Sep 17 00:00:00 2001 From: Jostein Berntsen Date: Sun, 6 Apr 2014 22:37:52 +0200 Subject: [PATCH 4/7] Revert "Revert "Signed-off-by: Jostein Berntsen "" This reverts commit 3ca91860374adefb5821ab70d1a3030883459231. --- manual/Day_To_Day_Juggling | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manual/Day_To_Day_Juggling b/manual/Day_To_Day_Juggling index 21e60dbb..a01ab787 100644 --- a/manual/Day_To_Day_Juggling +++ b/manual/Day_To_Day_Juggling @@ -257,7 +257,7 @@ as HTML pages from a web server. === Implementing the status tracking system === -==== Prerequesites ==== +==== Prerequisites ==== The .tjp and .tji files of your project plan should be managed by a revision control system. TaskJuggler does not require a particular @@ -285,7 +285,7 @@ For the email based communication you need to provide email addresses for all project contributors. This is done in the project plan in the resource definition by using the [[email]] attribute. - resource joe "Joe Avergage" { + resource joe "Joe Average" { email "joe@your_company.com } @@ -372,7 +372,7 @@ To test the command without sending out actual emails you can use the directories. A copy of the generated templates will be stored in ''''TimeSheetTemplates//'''' under ''''-date.tji''''. '''''''' is replaced with the -end date of the reporting interval and '''''''' is the ID +end date of the reporting interval and '''''''' is the ID of the resource. If you re-run the command existing templates will not be regenerated @@ -380,7 +380,7 @@ nor will they be sent out again. You can use the ''''-f'''' command line option to force them to be generated and sent out again. The ''''tj3ts_sender'''' command will also add the reporting interval -to a file called ''''TimeSheetTemplates/acceptable_invervals''''. +to a file called ''''TimeSheetTemplates/acceptable_intervals''''. We'll cover this file later on when we deal with the time sheet receiver. @@ -490,7 +490,7 @@ the taskjuggler home directory, you need to create it now. This procmail configuration will cause incoming emails that are addressed to timesheets@taskjuggler.your_company.com to be forwarded to the ''''tj3ts_receiver'''' program. Of course you need to replace -''your_comany.com'' with whatever domain you are using. +''your_company.com'' with whatever domain you are using. The received emails are then checked for syntactical and logical errors. If such are found, an email is sent back with an appropriate @@ -751,7 +751,7 @@ used. It will use the ''''tj3client'''' program to do retrieve the necessary data from the TaskJuggler server. Before the program can be used, a new section must be added to the -TaskJuggelr configuration file. +TaskJuggler configuration file. _statussheets: projectId: prj @@ -764,7 +764,7 @@ can hardcode that like in the example above. For multiple level of management you need to specify which group of managers should the report templates be generated for and pass that information on the command line. Use the ''''--hideresource'''' option to specify a -logicalexpression to filter away the resources you don't want +logical expression to filter away the resources you don't want templates to be generated for. The easiest way to achieve this is by using unique flags for each management level. In the example above we assume you have assigned the flag ''''manager'''' to each first-level From 645e57f521d98add5970063b2722306794203797 Mon Sep 17 00:00:00 2001 From: Jostein Berntsen Date: Sun, 6 Apr 2014 22:40:09 +0200 Subject: [PATCH 5/7] Revert "Signed-off-by: Jostein Berntsen " This reverts commit 163fabe4f21b92a9828f65ccd186526af6c3b401. --- manual/Day_To_Day_Juggling | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manual/Day_To_Day_Juggling b/manual/Day_To_Day_Juggling index a01ab787..21e60dbb 100644 --- a/manual/Day_To_Day_Juggling +++ b/manual/Day_To_Day_Juggling @@ -257,7 +257,7 @@ as HTML pages from a web server. === Implementing the status tracking system === -==== Prerequisites ==== +==== Prerequesites ==== The .tjp and .tji files of your project plan should be managed by a revision control system. TaskJuggler does not require a particular @@ -285,7 +285,7 @@ For the email based communication you need to provide email addresses for all project contributors. This is done in the project plan in the resource definition by using the [[email]] attribute. - resource joe "Joe Average" { + resource joe "Joe Avergage" { email "joe@your_company.com } @@ -372,7 +372,7 @@ To test the command without sending out actual emails you can use the directories. A copy of the generated templates will be stored in ''''TimeSheetTemplates//'''' under ''''-date.tji''''. '''''''' is replaced with the -end date of the reporting interval and '''''''' is the ID +end date of the reporting interval and '''''''' is the ID of the resource. If you re-run the command existing templates will not be regenerated @@ -380,7 +380,7 @@ nor will they be sent out again. You can use the ''''-f'''' command line option to force them to be generated and sent out again. The ''''tj3ts_sender'''' command will also add the reporting interval -to a file called ''''TimeSheetTemplates/acceptable_intervals''''. +to a file called ''''TimeSheetTemplates/acceptable_invervals''''. We'll cover this file later on when we deal with the time sheet receiver. @@ -490,7 +490,7 @@ the taskjuggler home directory, you need to create it now. This procmail configuration will cause incoming emails that are addressed to timesheets@taskjuggler.your_company.com to be forwarded to the ''''tj3ts_receiver'''' program. Of course you need to replace -''your_company.com'' with whatever domain you are using. +''your_comany.com'' with whatever domain you are using. The received emails are then checked for syntactical and logical errors. If such are found, an email is sent back with an appropriate @@ -751,7 +751,7 @@ used. It will use the ''''tj3client'''' program to do retrieve the necessary data from the TaskJuggler server. Before the program can be used, a new section must be added to the -TaskJuggler configuration file. +TaskJuggelr configuration file. _statussheets: projectId: prj @@ -764,7 +764,7 @@ can hardcode that like in the example above. For multiple level of management you need to specify which group of managers should the report templates be generated for and pass that information on the command line. Use the ''''--hideresource'''' option to specify a -logical expression to filter away the resources you don't want +logicalexpression to filter away the resources you don't want templates to be generated for. The easiest way to achieve this is by using unique flags for each management level. In the example above we assume you have assigned the flag ''''manager'''' to each first-level From 9b96bcb5828d65ab73c195442aea739f00efbcf3 Mon Sep 17 00:00:00 2001 From: Jostein Berntsen Date: Sun, 6 Apr 2014 22:40:34 +0200 Subject: [PATCH 6/7] Revert "Revert "Signed-off-by: Jostein Berntsen "" This reverts commit 3ca91860374adefb5821ab70d1a3030883459231. --- manual/Day_To_Day_Juggling | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manual/Day_To_Day_Juggling b/manual/Day_To_Day_Juggling index 21e60dbb..a01ab787 100644 --- a/manual/Day_To_Day_Juggling +++ b/manual/Day_To_Day_Juggling @@ -257,7 +257,7 @@ as HTML pages from a web server. === Implementing the status tracking system === -==== Prerequesites ==== +==== Prerequisites ==== The .tjp and .tji files of your project plan should be managed by a revision control system. TaskJuggler does not require a particular @@ -285,7 +285,7 @@ For the email based communication you need to provide email addresses for all project contributors. This is done in the project plan in the resource definition by using the [[email]] attribute. - resource joe "Joe Avergage" { + resource joe "Joe Average" { email "joe@your_company.com } @@ -372,7 +372,7 @@ To test the command without sending out actual emails you can use the directories. A copy of the generated templates will be stored in ''''TimeSheetTemplates//'''' under ''''-date.tji''''. '''''''' is replaced with the -end date of the reporting interval and '''''''' is the ID +end date of the reporting interval and '''''''' is the ID of the resource. If you re-run the command existing templates will not be regenerated @@ -380,7 +380,7 @@ nor will they be sent out again. You can use the ''''-f'''' command line option to force them to be generated and sent out again. The ''''tj3ts_sender'''' command will also add the reporting interval -to a file called ''''TimeSheetTemplates/acceptable_invervals''''. +to a file called ''''TimeSheetTemplates/acceptable_intervals''''. We'll cover this file later on when we deal with the time sheet receiver. @@ -490,7 +490,7 @@ the taskjuggler home directory, you need to create it now. This procmail configuration will cause incoming emails that are addressed to timesheets@taskjuggler.your_company.com to be forwarded to the ''''tj3ts_receiver'''' program. Of course you need to replace -''your_comany.com'' with whatever domain you are using. +''your_company.com'' with whatever domain you are using. The received emails are then checked for syntactical and logical errors. If such are found, an email is sent back with an appropriate @@ -751,7 +751,7 @@ used. It will use the ''''tj3client'''' program to do retrieve the necessary data from the TaskJuggler server. Before the program can be used, a new section must be added to the -TaskJuggelr configuration file. +TaskJuggler configuration file. _statussheets: projectId: prj @@ -764,7 +764,7 @@ can hardcode that like in the example above. For multiple level of management you need to specify which group of managers should the report templates be generated for and pass that information on the command line. Use the ''''--hideresource'''' option to specify a -logicalexpression to filter away the resources you don't want +logical expression to filter away the resources you don't want templates to be generated for. The easiest way to achieve this is by using unique flags for each management level. In the example above we assume you have assigned the flag ''''manager'''' to each first-level From 8534f300576a046b3753c7d1f3f739743597f05c Mon Sep 17 00:00:00 2001 From: Jostein Berntsen Date: Sun, 6 Apr 2014 22:41:34 +0200 Subject: [PATCH 7/7] Revert "Revert "Revert "Signed-off-by: Jostein Berntsen """ This reverts commit d3c9d87a4fd58c9af15a44eb6c2b6c131f939912. --- manual/Day_To_Day_Juggling | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manual/Day_To_Day_Juggling b/manual/Day_To_Day_Juggling index a01ab787..21e60dbb 100644 --- a/manual/Day_To_Day_Juggling +++ b/manual/Day_To_Day_Juggling @@ -257,7 +257,7 @@ as HTML pages from a web server. === Implementing the status tracking system === -==== Prerequisites ==== +==== Prerequesites ==== The .tjp and .tji files of your project plan should be managed by a revision control system. TaskJuggler does not require a particular @@ -285,7 +285,7 @@ For the email based communication you need to provide email addresses for all project contributors. This is done in the project plan in the resource definition by using the [[email]] attribute. - resource joe "Joe Average" { + resource joe "Joe Avergage" { email "joe@your_company.com } @@ -372,7 +372,7 @@ To test the command without sending out actual emails you can use the directories. A copy of the generated templates will be stored in ''''TimeSheetTemplates//'''' under ''''-date.tji''''. '''''''' is replaced with the -end date of the reporting interval and '''''''' is the ID +end date of the reporting interval and '''''''' is the ID of the resource. If you re-run the command existing templates will not be regenerated @@ -380,7 +380,7 @@ nor will they be sent out again. You can use the ''''-f'''' command line option to force them to be generated and sent out again. The ''''tj3ts_sender'''' command will also add the reporting interval -to a file called ''''TimeSheetTemplates/acceptable_intervals''''. +to a file called ''''TimeSheetTemplates/acceptable_invervals''''. We'll cover this file later on when we deal with the time sheet receiver. @@ -490,7 +490,7 @@ the taskjuggler home directory, you need to create it now. This procmail configuration will cause incoming emails that are addressed to timesheets@taskjuggler.your_company.com to be forwarded to the ''''tj3ts_receiver'''' program. Of course you need to replace -''your_company.com'' with whatever domain you are using. +''your_comany.com'' with whatever domain you are using. The received emails are then checked for syntactical and logical errors. If such are found, an email is sent back with an appropriate @@ -751,7 +751,7 @@ used. It will use the ''''tj3client'''' program to do retrieve the necessary data from the TaskJuggler server. Before the program can be used, a new section must be added to the -TaskJuggler configuration file. +TaskJuggelr configuration file. _statussheets: projectId: prj @@ -764,7 +764,7 @@ can hardcode that like in the example above. For multiple level of management you need to specify which group of managers should the report templates be generated for and pass that information on the command line. Use the ''''--hideresource'''' option to specify a -logical expression to filter away the resources you don't want +logicalexpression to filter away the resources you don't want templates to be generated for. The easiest way to achieve this is by using unique flags for each management level. In the example above we assume you have assigned the flag ''''manager'''' to each first-level