Skip to content

Commit

Permalink
Updated document. Fixes #279
Browse files Browse the repository at this point in the history
  • Loading branch information
julie authored and julie committed Mar 16, 2017
1 parent 1b71e73 commit ceff9f3
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 21 deletions.
9 changes: 7 additions & 2 deletions HowToUseScrumBot.md
View file
Expand Up @@ -4,11 +4,11 @@
You may skip Step 1, if it's already done.

#### 1. Common Initial Setup
* A user must be registered in Promact-OAuth-Server and must be externally logged in from Promact-OAuth-Server in our slack application.
* A user must add Promact's slack app to their slack team.
* A user must be registered(details such as Slack Name must be exactly same as slack username) in Promact-OAuth-Server and must be externally logged in from Promact-OAuth-Server in our slack application.

#### 2. Scrum Meeting Setup
* Add the project details of the slack channel in which scrum meeting has to be conducted to Promact-Oauth-Server, where the slack channel name must be entered as it is given in slack.
* Add the project details of the slack channel in which scrum meeting has to be conducted to Promact-Oauth-Server and link the slack channel to the project(follow instructions on point 4 to link).
* Add the team members of the project(members of the slack channel) except the TL of the project.
* Add the scrum bot to the slack channel in which scrum meeting has to be conducted.

Expand All @@ -22,6 +22,11 @@ You may skip Step 1, if it's already done.
* The previous day scrum data (if any) of a user will be displayed to the user along with the first question.
* If any user contacts the Bot (as in direct conversation with the bot), bot will not respond as expected, unless if it is for taking help i.e. by writing **“scrum help”**.

#### 4. Link Commands
* Only team leaders can execute the following commands in the slack channels of their OAuth projects.
* Use `link "projectname"`to link slack channel to the OAuth project of the name _projectname_.
* Use `unlink "projectname"` to unlink slack channel from the OAuth project.
* Use `list links` to get the list of OAuth projects (of which the user is team leader) and their correspondingly linked Slack channels.

# Rules and Limitations
#### List of Rules and Limitations of Scrum meeting conducted by a scrum bot
Expand Down
21 changes: 6 additions & 15 deletions Slack.Automation/Promact.Erp.Util/StringConstants/StringConstantRepository.cs
View file
Expand Up @@ -512,7 +512,7 @@ public string ScrumHelpMessage
{
get
{
return "To automate your stand up meet.\nLogin with Promact and add our slack app to your slack team, also add me to your channel.\nType *start <@{0}>* to start your team's stand up meet.\nTeam members will be asked questions and only the person who is asked question must answer it.\n>If a person is on leave and asked question,then any team member can write *leave _@team member's name_*.\n>Members who are marked as in-active in OAuth will not be asked questions.\nThe stand up meet has to be conducted in one go.\n>If it gets interrupted in any circumstances, you can start from where you left by typing the keyword *start <@{0}>*.\nScrum can be halted by writing *scrum halt* and it can be resumed by *scrum resume*. \nHope this helped.\n\n_P.S. If these instructions are not followed, I might misbehave_.\n_My apologies in advance :wink:_";
return "To automate your stand up meet.\nLogin with Promact and add our slack app to your slack team.\nAdd me to your channel and link your Slack Channel to OAuth Project (further instructions to link are given below).\nType *start <@{0}>* to start your team's stand up meet.\nTeam members will be asked questions and only the person who is asked question must answer it.\n>If a person is on leave and asked question,then any team member can write *leave _@team member's name_*.\n>Members who are marked as in-active in OAuth will not be asked questions.\nThe stand up meet has to be conducted in one go.\n>If it gets interrupted in any circumstances, you can start from where you left by typing the command *start <@{0}>*.\nScrum can be halted by writing *scrum halt* and it can be resumed by *scrum resume*. \nHope this helped.\n\n_P.S. If these instructions are not followed, I might misbehave_.\n_My apologies in advance :wink:_ \n\n *Steps to link Slack channel to OAuth project (Exclusively for Team Leaders)* \n>Use `link \"projectname\"` to link the slack channel to the OAuth project with name _projectname_\n>Use `unlink \"projectname\"` to unlink Slack channel from OAuth project.\n>Use `list links` to get the list of OAuth projects (of which the user is team leader) and their correspondingly linked Slack channels";
}
}
public string NotAUser
Expand Down Expand Up @@ -774,7 +774,7 @@ public string PreviousDayScrumAnswer
{
get
{
return "*_Q_*: {0}\r\n*_A_*: _{1}_\r\n";
return "*_Q_*: {0}\r\n*_A_*: {1}\r\n";
}
}

Expand Down Expand Up @@ -953,7 +953,7 @@ public string OAuthProjName
public string StringIdForTest
{
get
{
{
return "13b0f2ca-92f5-4713-a67e-37e50172e148";
}
}
Expand Down Expand Up @@ -1057,7 +1057,7 @@ public string UnlinkTest
return "unlink \"Sci bot testing\"";

}
}
}
public string InActiveProjectTeamLeaderDetail
{
get
Expand Down Expand Up @@ -2212,17 +2212,8 @@ public string InActiveProjectDetailsFromOauth
get
{
return "{\"Id\":1,\"Name\":\"Sci bot testing\",\"SlackChannelName\":\"scitestbot\",\"IsActive\":false,\"TeamLeaderId\":\"29c96e32-76fe-4915-bb17-b7bd987535da\",\"CreatedBy\":\"ca395fa8-dc28-4702-ab7e-2c99d8efa1eb\",\"CreatedDate\":\"0001-01-01T00:00:00\",\"UpdatedBy\":\"ca395fa8-dc28-4702-ab7e-2c99d8efa1eb\",\"UpdatedDate\":null,\"TeamLeader\":null,\"ApplicationUsers\":[{\"Id\":\"63d28a0d-b0ad-4356-93c7-a0148a3038a5\",\"FirstName\":\"julie\",\"LastName\":\"julie\",\"IsActive\":true,\"Role\":null,\"NumberOfCasualLeave\":6.0,\"NumberOfSickLeave\":3.0,\"JoiningDate\":\"2016-11-07T18:30:00\",\"SlackUserName\":null,\"SlackUserId\":null,\"Email\":\"julie@promactinfo.com\",\"Password\":null,\"UserName\":\"julie@promactinfo.com\",\"UniqueName\":\"julie-julie@promactinfo.com\",\"RoleName\":null},{\"Id\":\"ca395fa8-dc28-4702-ab7e-2c99d8efa1eb\",\"FirstName\":\"Admin\",\"LastName\":\"Promact\",\"IsActive\":true,\"Role\":null,\"NumberOfCasualLeave\":0.0,\"NumberOfSickLeave\":0.0,\"JoiningDate\":\"0001-01-01T00:00:00\",\"SlackUserName\":null,\"SlackUserId\":null,\"Email\":\"roshni@promactinfo.com\",\"Password\":null,\"UserName\":\"roshni@promactinfo.com\",\"UniqueName\":\"Admin-roshni@promactinfo.com\",\"RoleName\":null},{\"Id\":\"cb136c2c-afad-4626-932d-613c35d7773e\",\"FirstName\":\"Ronak\",\"LastName\":\"Shah\",\"IsActive\":true,\"Role\":null,\"NumberOfCasualLeave\":6.0,\"NumberOfSickLeave\":3.0,\"JoiningDate\":\"2016-11-15T00:00:00\",\"SlackUserName\":null,\"SlackUserId\":null,\"Email\":\"ronak.shah@promactinfo.com\",\"Password\":null,\"UserName\":\"ronak.shah@promactinfo.com\",\"UniqueName\":\"Ronak-ronak.shah@promactinfo.com\",\"RoleName\":null}]}";
// return "{\"id\":2,\"name\":\"testbotgroup\",\"slackChannelName\":\"testbotgroup\",\"isActive\":false,\"teamLeaderId\":\"5c84049f-f861-406d-b420-e1bf03c9e06e\",\"createdBy\":\"1bac6614-7a2b-42fa-9f18-b6a19d8e25fb\",\"createdDate\":null,\"updatedBy\":null,\"updatedDate\":null,\"teamLeader\":null,\"applicationUsers\":null}";
}
}
//public string InActiveProjectDetailsFromOauthActiveUser
//{
// get
// {
// return "{\"Id\":1,\"Name\":\"Sci bot testing\",\"SlackChannelName\":\"scitestbot\",\"IsActive\":false,\"TeamLeaderId\":\"29c96e32-76fe-4915-bb17-b7bd987535da\",\"CreatedBy\":\"ca395fa8-dc28-4702-ab7e-2c99d8efa1eb\",\"CreatedDate\":\"0001-01-01T00:00:00\",\"UpdatedBy\":\"ca395fa8-dc28-4702-ab7e-2c99d8efa1eb\",\"UpdatedDate\":null,\"TeamLeader\":null,\"ApplicationUsers\":[{\"Id\":\"13b0f2ca-92f5-4713-a67e-37e50172e148f\",\"FirstName\":\"Apoorva\",\"LastName\":\"Promact\",\"IsActive\":true,\"Email\":\"apoorvapatel@promactinfo.com\",\"Password\":null,\"UserName\":\"apoorvapatel\",\"UniqueName\":\"Apoorva-apoorvapatel@promactinfo.com\"},{\"Id\":\"13b0f2ca-92f5-4713-a67e-37e50172e148\",\"FirstName\":\"Pranali\",\"LastName\":\"Promact\",\"IsActive\":true,\"Email\":\"pranali@promactinfo.com\",\"Password\":null,\"UserName\":\"pranali\",\"UniqueName\":\"Pranali-pranali@promactinfo.com\"}]}";
// // return "{\"id\":2,\"name\":\"testbotgroup\",\"slackChannelName\":\"testbotgroup\",\"isActive\":false,\"teamLeaderId\":\"5c84049f-f861-406d-b420-e1bf03c9e06e\",\"createdBy\":\"1bac6614-7a2b-42fa-9f18-b6a19d8e25fb\",\"createdDate\":null,\"updatedBy\":null,\"updatedDate\":null,\"teamLeader\":null,\"applicationUsers\":null}";
// }
//}
public string InActiveProjectDetailsFromOauthInActiveUser
{
get
Expand All @@ -2234,7 +2225,7 @@ public string ProjectChannelNotLinked
{
get
{
return "Please contact your administrator to link slack channel with OAuth Project";
return "Please contact your team leader to link slack channel with OAuth Project.\nFeel free to use *_scrum help_* command for further instructions.";
}
}
public string LeaveCommand
Expand Down Expand Up @@ -2625,7 +2616,7 @@ public string TestQuestion
{
get
{
return "Good Day <@pranali>!\n\r\n*Your scrum status of {0} is :*\n\r\n*_Q_*: What did you do yesterday?\r\n*_A_*: _Sorry I have nothing to ask you._\r\n\r\n*Please answer the following questions today*\r\n\r\nWhat did you do yesterday?";
return "Good Day <@pranali>!\n\r\n*Your scrum status of {0} is :*\n\r\n*_Q_*: What did you do yesterday?\r\n*_A_*: Sorry I have nothing to ask you.\r\n\r\n*Please answer the following questions today*\r\n\r\nWhat did you do yesterday?";
}
}
public string InActiveInOAuth
Expand Down
3 changes: 2 additions & 1 deletion Slack.Automation/Promact.Erp.Web/Content/css/erp-custom.css
View file
Expand Up @@ -15,7 +15,8 @@ md2-chips .md2-chips-container {box-shadow: none !important;}
.md2-autocomplete-trigger.is-focused{border-bottom:2px solid #169F85!important}
.taskmail-details label.selc-date {padding: 0;vertical-align: top;display: block;padding-top: 7px;text-align:right}
.taskmail-details table{margin:30px 0;}
.taskmail-details .tsk-view label{float:left;padding-right:10px;width:104px;text-align:right}
.taskmail-details .tsk-view label{float:left;padding-right:10px;text-align:right}
.taskmail-details .tsk-view div p{clear:both;display:inline-block}
.taskmail-details .btn-back , .leave-report-details .btn-back , .scrum-details .btn-back , .leave-report-details .btn-back{padding:6px 15px;font-size:14px;}
.taskmail-details .btn-back .fa-arrow-left , .leave-report-details .btn-back .fa-arrow-left , .scrum-details .btn-back .fa-arrow-left{font-size: 13px;padding: 0px 5px 0px 0px;vertical-align: middle;margin-top:-1px;}

Expand Down
6 changes: 3 additions & 3 deletions Slack.Automation/Promact.Erp.Web/app/taskmail/taskmail-details/taskmail-details.html
View file
Expand Up @@ -24,12 +24,12 @@ <h3>Task Mail Details</h3>
</div>
</div>
<div *ngFor="let taskmailUser of taskMail" class="tsk-view">
<div class="form-group row">
<div class="col-md-1">
<div class="clearfix col-md-12">
<div class="pull-left">
<label class="control-label"> Name:</label>
<p>{{taskmailUser.UserName}}</p>
</div>
<div class="col-md-3">
<div class="pull-right">
<label class="control-label"> Task Mail Date:</label>
<p>{{taskmailUser.CreatedOns}}</p>
</div>
Expand Down

0 comments on commit ceff9f3

Please sign in to comment.