Make employee achievement title form field required

r7-labs · Mar 3, 2017 · 9869e80 · 9869e80
1 parent 9d1e4f4
commit 9869e80
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/R7.University.Employee/App_LocalResources/EditEmployee.ascx.resx b/R7.University.Employee/App_LocalResources/EditEmployee.ascx.resx
@@ -240,6 +240,9 @@
  <data name="labelAchievementTitle.Help">
  <value>Enter the title for the described achievement.</value>
  </data>
+ <data name="AchievementTitle.Required">
+ <value>Achievement title is required.</value>
+ </data>
  <data name="AchievementTitle.MaxLength">
  <value>Achievement title is too long.</value>
  </data> 

diff --git a/R7.University.Employee/App_LocalResources/EditEmployee.ascx.ru-RU.resx b/R7.University.Employee/App_LocalResources/EditEmployee.ascx.ru-RU.resx
@@ -256,8 +256,11 @@
  <value>Название (роль):</value>
  </data>
  <data name="labelAchievementTitle.Help">
- <value>Введите название описываемого достижения.</value>
+ <value>Введите название (заголовок) описываемого достижения.</value>
  </data>
+ <data name="AchievementTitle.Required">
+ <value>Введите название достижения.</value>
+ </data>
  <data name="AchievementTitle.MaxLength">
  <value>Название достижения слишком длинное.</value>
  </data>

diff --git a/R7.University.Employee/EditEmployee.ascx b/R7.University.Employee/EditEmployee.ascx
@@ -249,15 +249,17 @@
  DataTextField="Text"
  DataValueField="Value" />
  </asp:Panel>
- <asp:Panel id="panelAchievementTitle" runat="server" class="dnnFormItem">
+ <asp:Panel id="panelAchievementTitle" runat="server" class="dnnFormItem dnnFormRequired">
  <dnn:Label id="labelAchievementTitle" runat="server" ControlName="textAchievementTitle" />
  <asp:TextBox id="textAchievementTitle" runat="server" TextMode="MultiLine" Rows="3" />
- <asp:RegularExpressionValidator runat="server"
+ <asp:RequiredFieldValidator runat="server" resourcekey="AchievementTitle.Required" 
+ ControlToValidate="textAchievementTitle" ValidationGroup="Achievements"
+ Display="Dynamic" CssClass="dnnFormMessage dnnFormError" />
+ <asp:RegularExpressionValidator runat="server"
  CssClass="dnnFormMessage dnnFormError" resourcekey="AchievementTitle.MaxLength"
  ControlToValidate="textAchievementTitle" Display="Dynamic"
- ValidationExpression="[\s\S]{0,250}" ValidationGroup="Achievements">
- </asp:RegularExpressionValidator>
- </asp:Panel>
+ ValidationExpression="[\s\S]{0,250}" ValidationGroup="Achievements" />
+ </asp:Panel>
  <div class="dnnFormItem">
  <dnn:Label id="labelAchievementDescription" runat="server" ControlName="textAchievementDescription" />
  <asp:TextBox id="textAchievementDescription" runat="server" TextMode="MultiLine" Rows="3" />

diff --git a/R7.University/releaseNotes.htm b/R7.University/releaseNotes.htm
@@ -6,6 +6,7 @@ <h3>Version 1.14.1</h3>
  <li>Fix duplicate AchievementType records created then editing employee achievements (#170).</li>
  <li>Resolve errors on editing and deleting employee achievements.</li>
  <li>Fix custom achievement type name not displayed.</li>
+ <li>Make employee achievement title form field required.</li>
  <li>Improve performance of EmployeeDirectory (teachers mode) and EduProgramProfileDirectory (documents mode) by flattening viewmodels (#130).</li>
  <li>More code refactoring.</li>
 </ul>