Skip to content

Commit 5c92f46

Browse files
nop77svknop77svk
committed
🔀 merge from main
2 parents a172298 + 5444572 commit 5c92f46

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+3166
-813
lines changed

‎GlobalSuppressions.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,25 @@
55

66
[assembly: SuppressMessage("Style", "IDE0017")] // Object properties initialization can be simplified
77
[assembly: SuppressMessage("Style", "IDE0057")] // Substring can be simplified
8-
[assembly: SuppressMessage("Style", "IDE0060")] // Remove unused parameter // 2do!
8+
[assembly: SuppressMessage("Style", "IDE0060")] // Remove unused parameter
99
[assembly: SuppressMessage("Style", "IDE0063")] // Use simple 'using' statement
1010
[assembly: SuppressMessage("Style", "IDE0090")] // Use new (...)
1111

1212
[assembly: SuppressMessage("Usage", "CA1816")] // Dispose methods should call SuppressFinalize
13-
[assembly: SuppressMessage("Style", "CA2208")] // Wrong paramName to Argument...Exception
1413

1514
[assembly: SuppressMessage("Style", "SA1009")] // Closing parenthesis should not be preceded by a space
1615
[assembly: SuppressMessage("Style", "SA1011")] // Closing square bracket should be followed by a space
17-
[assembly: SuppressMessage("Style", "SA1021")] // Negative signe should be preceded by a space
16+
[assembly: SuppressMessage("Style", "SA1021")] // Negative sign should be preceded by a space
1817
[assembly: SuppressMessage("Style", "SA1101")] // Prefix local calls with this
1918
[assembly: SuppressMessage("Style", "SA1111")] // Closing parenthesis should be on line of last parameter
20-
[assembly: SuppressMessage("Style", "SA1118")] // parameter spans multiple lines // 2do!
21-
[assembly: SuppressMessage("Style", "SA1122")] // Use string.Empty // 2do!
19+
[assembly: SuppressMessage("Style", "SA1118")] // parameter spans multiple lines
2220
[assembly: SuppressMessage("Style", "SA1201")] // Enum should not follow a class
2321
[assembly: SuppressMessage("Style", "SA1300")] // Element ... should begin with an uppercase letter
2422
[assembly: SuppressMessage("Style", "SA1309")] // Field should not begin with an underscore
2523
[assembly: SuppressMessage("Style", "SA1408")] // Conditional expressions should declare precedence
2624
[assembly: SuppressMessage("Style", "SA1413")] // Use trailing comma in multi-line initializers
2725
[assembly: SuppressMessage("Style", "SA1503")] // Braces should not be ommitted
28-
[assembly: SuppressMessage("Style", "SA1515")] // 1-line comments should be preceded by a blank line // 2do!
26+
[assembly: SuppressMessage("Style", "SA1515")] // 1-line comments should be preceded by a blank line
2927
[assembly: SuppressMessage("Style", "SA1516")] // Elements should be separated by a blank line
3028

3129
[assembly: SuppressMessage("Style", "SA0001")] // XML comment analysis disabled

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,3 @@ Five columns, data delimited (by default) by a colon:
4343
- <code>Activity</code> (string) - Tempo Timesheets worklog type or ICTime activity; values are remapped
4444
- <code>TimeSpent</code> (string) - time to be logged for the Jira issue and the date (valid formats: <code>HH:MI</code>, <code>MI</code>, <code>HH h MI</code>, <code>HH h MI m</code>)
4545
- <code>Comment</code> (string) - optional worklog comment
46-
47-
The <code>Activity</code> values are remapped via config <code>$.JiraServer.ActivityMap</code>. The mapping configuration depends on your Jira server+plugins configuration and is a subject of manual setup by yourself.

‎jira-worklogger.sln

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jwl.infra", "jwl.infra\jwl.
1313
EndProject
1414
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jwl.core", "jwl.core\jwl.core.csproj", "{DA3C8E30-0358-4103-97E0-29740E648A27}"
1515
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jwl.wadl", "jwl.wadl\jwl.wadl.csproj", "{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}"
17+
EndProject
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jwl.test", "jwl.test\jwl.test.csproj", "{35704A9C-16A2-4F64-9042-C59421FCDE9B}"
19+
EndProject
1620
Global
1721
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1822
Debug|Any CPU = Debug|Any CPU
@@ -83,6 +87,30 @@ Global
8387
{DA3C8E30-0358-4103-97E0-29740E648A27}.Release|x64.Build.0 = Release|Any CPU
8488
{DA3C8E30-0358-4103-97E0-29740E648A27}.Release|x86.ActiveCfg = Release|Any CPU
8589
{DA3C8E30-0358-4103-97E0-29740E648A27}.Release|x86.Build.0 = Release|Any CPU
90+
{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
91+
{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
92+
{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}.Debug|x64.ActiveCfg = Debug|Any CPU
93+
{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}.Debug|x64.Build.0 = Debug|Any CPU
94+
{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}.Debug|x86.ActiveCfg = Debug|Any CPU
95+
{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}.Debug|x86.Build.0 = Debug|Any CPU
96+
{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
97+
{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}.Release|Any CPU.Build.0 = Release|Any CPU
98+
{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}.Release|x64.ActiveCfg = Release|Any CPU
99+
{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}.Release|x64.Build.0 = Release|Any CPU
100+
{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}.Release|x86.ActiveCfg = Release|Any CPU
101+
{3A874F02-B059-4DEE-A1EF-2F13BC981BBA}.Release|x86.Build.0 = Release|Any CPU
102+
{35704A9C-16A2-4F64-9042-C59421FCDE9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
103+
{35704A9C-16A2-4F64-9042-C59421FCDE9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
104+
{35704A9C-16A2-4F64-9042-C59421FCDE9B}.Debug|x64.ActiveCfg = Debug|Any CPU
105+
{35704A9C-16A2-4F64-9042-C59421FCDE9B}.Debug|x64.Build.0 = Debug|Any CPU
106+
{35704A9C-16A2-4F64-9042-C59421FCDE9B}.Debug|x86.ActiveCfg = Debug|Any CPU
107+
{35704A9C-16A2-4F64-9042-C59421FCDE9B}.Debug|x86.Build.0 = Debug|Any CPU
108+
{35704A9C-16A2-4F64-9042-C59421FCDE9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
109+
{35704A9C-16A2-4F64-9042-C59421FCDE9B}.Release|Any CPU.Build.0 = Release|Any CPU
110+
{35704A9C-16A2-4F64-9042-C59421FCDE9B}.Release|x64.ActiveCfg = Release|Any CPU
111+
{35704A9C-16A2-4F64-9042-C59421FCDE9B}.Release|x64.Build.0 = Release|Any CPU
112+
{35704A9C-16A2-4F64-9042-C59421FCDE9B}.Release|x86.ActiveCfg = Release|Any CPU
113+
{35704A9C-16A2-4F64-9042-C59421FCDE9B}.Release|x86.Build.0 = Release|Any CPU
86114
EndGlobalSection
87115
GlobalSection(SolutionProperties) = preSolution
88116
HideSolutionNode = FALSE

‎jwl.console/CLI.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ namespace jwl.console;
44
[Verb("fill", isDefault: true, HelpText = "Fill Jira with worklogs")]
55
public class FillCLI
66
{
7-
[Option('v', "verbose", HelpText = "\nGive more verbose feedback\nNote: Not implemented yet! 2do! :-)", Default = false, Hidden = true)]
8-
public bool UseVerboseFeedback { get; set; }
9-
107
[Option('i', "input", HelpText = "\nInput CSVs with the worklogs", Separator = ',', Required = true)]
118
public IEnumerable<string> InputFiles { get; set; } = new string[0];
129

@@ -21,7 +18,7 @@ public class FillCLI
2118
public string? UserCredentials { get; set; }
2219

2320
[Option("server-flavour", HelpText = "Jira server flavour (whether vanilla or with some timesheet plugins)"
24-
+ $"\nJSON config: $.{nameof(core.AppConfig.JiraServer)}.{nameof(jira.ServerConfig.ServerFlavour)}"
21+
+ $"\nJSON config: $.{nameof(core.AppConfig.JiraServer)}.{nameof(jira.ServerConfig.Flavour)}"
2522
+ $"\nAvailable values: {nameof(jira.JiraServerFlavour.Vanilla)}, {nameof(jira.JiraServerFlavour.TempoTimeSheets)}, {nameof(jira.JiraServerFlavour.ICTime)}")]
2623
public string? ServerFlavour { get; set; }
2724

@@ -52,11 +49,10 @@ public core.AppConfig ToAppConfig()
5249

5350
return new core.AppConfig()
5451
{
55-
UseVerboseFeedback = UseVerboseFeedback,
5652
JiraServer = new jira.ServerConfig()
5753
{
58-
ServerFlavour = ServerFlavour,
59-
ActivityMap = null,
54+
Flavour = ServerFlavour,
55+
FlavourOptions = null,
6056
BaseUrl = jiraServerSpecification,
6157
UseProxy = !NoProxy,
6258
MaxConnectionsPerServer = MaxConnectionsPerServer,

0 commit comments

Comments
 (0)