Merge pull request #308 from roman-yagodin/development

Merge development changes
r7-labs · Feb 15, 2019 · 98cab09 · 98cab09
2 parents c264aba + 3a77c1e
commit 98cab09
Show file tree

Hide file tree

Showing 304 changed files with 3,394 additions and 3,151 deletions.
diff --git a/Deploy/Deploy.csproj b/Deploy/Deploy.csproj
@@ -9,8 +9,8 @@
  <OutputType>Library</OutputType>
  <RootNamespace>Deploy</RootNamespace>
  <AssemblyName>Deploy</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <ReleaseVersion>2.1.1</ReleaseVersion>
+ <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+ <ReleaseVersion>2.2</ReleaseVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>

diff --git a/Deploy/InstallPackage.targets b/Deploy/InstallPackage.targets
@@ -20,8 +20,7 @@
  <ItemGroup>
  <InstallBinaryFiles Include="$(MainProjectOutputPath)/$(MainProjectName)*.dll" />
  <InstallBinaryFiles Include="$(MainProjectOutputPath)/$(MainProjectName)*.pdb" Condition="'$(Configuration)' == 'Debug'" />
- <InstallBinaryFiles Include="$(MainProjectOutputPath)/EntityFramework*.dll" />
- </ItemGroup>
+ </ItemGroup>
  <!-- Declare manifest files -->
  <ItemGroup>
  <InstallManifestFiles Include="$(MainProjectPath)/*.dnn*" />

diff --git a/Deploy/LocalDeploy.targets b/Deploy/LocalDeploy.targets
@@ -12,8 +12,7 @@
  <ItemGroup>
  <LocalDeployBinaryFiles Include="$(MainProjectOutputPath)/$(MainProjectName)*.dll" />
  <LocalDeployBinaryFiles Include="$(MainProjectOutputPath)/$(MainProjectName)*.pdb" Condition="'$(Configuration)' == 'Debug'" />
- <LocalDeployBinaryFiles Include="$(MainProjectOutputPath)/EntityFramework*.dll" />
- </ItemGroup>
+ </ItemGroup>
  <!-- Declare resource files -->
  <ItemGroup>
  <LocalDeployResourceFiles Include="../**/*.ascx" />

diff --git a/R7.University.Controls/App_LocalResources/EditDisciplines.ascx.ru-RU.resx b/R7.University.Controls/App_LocalResources/EditDisciplines.ascx.ru-RU.resx
@@ -30,18 +30,6 @@
  <data name="labelDisciplines.Help" xml:space="preserve">
  <value>Перечислите преподаваемые дисциплины.</value>
  </data>
- <data name="checkAddToVocabulary.Text" xml:space="preserve">
- <value>Добавить в словарь</value>
- </data>
- <data name="Division.Column" xml:space="preserve">
- <value>Подразделение</value>
- </data>
- <data name="Position.Column" xml:space="preserve">
- <value>Должность</value>
- </data>
- <data name="IsPrime.Column" xml:space="preserve">
- <value>Основная</value>
- </data>
  <data name="buttonAddDiscipline.Text" xml:space="preserve">
  <value>Добавить дисциплины</value>
  </data>

diff --git a/R7.University.Controls/App_LocalResources/EditDocuments.ascx.resx b/R7.University.Controls/App_LocalResources/EditDocuments.ascx.resx
@@ -51,12 +51,6 @@
  <data name="SystemDocumentType_WorkProgramOfPractice.Text" xml:space="preserve">
  <value>Work Program Of Practice</value>
  </data>
- <data name="SystemDocumentType_Contingent.Text" xml:space="preserve">
- <value>Contingent Info **obsolete**</value>
- </data>
- <data name="SystemDocumentType_ContingentMovement.Text" xml:space="preserve">
- <value>Contingent Movement Info **obsolete**</value>
- </data>
  <data name="labelDocumentTitle.Text" xml:space="preserve">
  <value>Title:</value>
  </data>

diff --git a/R7.University.Controls/App_LocalResources/EditDocuments.ascx.ru-RU.resx b/R7.University.Controls/App_LocalResources/EditDocuments.ascx.ru-RU.resx
@@ -51,12 +51,6 @@
  <data name="SystemDocumentType_WorkProgramOfPractice.Text" xml:space="preserve">
  <value>Рабочая программа практики</value>
  </data>
- <data name="SystemDocumentType_Contingent.Text" xml:space="preserve">
- <value>Сведения о численности обучающихся **устарело**</value>
- </data>
- <data name="SystemDocumentType_ContingentMovement.Text" xml:space="preserve">
- <value>Сведения о результатах перевода, восстановления и отчисления **устарело**</value>
- </data>
  <data name="labelDocumentTitle.Text" xml:space="preserve">
  <value>Название:</value>
  </data>

diff --git a/R7.University.Controls/DivisionSelector.ascx.cs b/R7.University.Controls/DivisionSelector.ascx.cs
@@ -27,7 +27,8 @@
 using DotNetNuke.Services.Localization;
 using DotNetNuke.UI.Modules;
 using DotNetNuke.Web.UI.WebControls;
-using R7.Dnn.Extensions.ControlExtensions;
+using R7.Dnn.Extensions.Controls;
+using R7.Dnn.Extensions.Text;
 using R7.Dnn.Extensions.Utilities;
 using R7.Dnn.Extensions.ViewModels;
 using R7.University.Models;
@@ -50,9 +51,9 @@ public int? DivisionId
  {
  get {
  if (IsCurrentMode (DivisionSelectionMode.List)) {
- return TypeUtils.ParseToNullable<int> (comboDivision.SelectedValue);
+ return ParseHelper.ParseToNullable<int> (comboDivision.SelectedValue, true);
  }
- return TypeUtils.ParseToNullable<int> (treeDivision.SelectedValue);
+ return ParseHelper.ParseToNullable<int> (treeDivision.SelectedValue, true);
  }
  set {
  if (IsCurrentMode (DivisionSelectionMode.List)) {

diff --git a/R7.University.Controls/EditAchievements.ascx b/R7.University.Controls/EditAchievements.ascx
@@ -110,13 +110,14 @@
  <asp:LinkButton id="buttonAddItem" runat="server" resourcekey="buttonAddAchievement" 
  CssClass="dnnPrimaryAction" CommandArgument="Add"
  CausesValidation="true" ValidationGroup="Achievements" />
- </li> 
- <li>
+ </li>
+ <li>
  <asp:LinkButton id="buttonUpdateItem" runat="server" resourcekey="buttonUpdateAchievement" 
  CssClass="dnnPrimaryAction" CommandArgument="Update"
  CausesValidation="true" ValidationGroup="Achievements" />
  </li> 
- <li>
+ <li>&nbsp;</li>
+ <li>
  <asp:LinkButton id="buttonCancelEditItem" runat="server" resourcekey="CancelEdit" 
  CssClass="dnnSecondaryAction" />
  </li>

diff --git a/R7.University.Controls/EditAchievements.cs b/R7.University.Controls/EditAchievements.cs
@@ -26,8 +26,9 @@
 using DotNetNuke.Common.Utilities;
 using DotNetNuke.Entities.Modules;
 using DotNetNuke.Services.Exceptions;
-using R7.Dnn.Extensions.ControlExtensions;
-using R7.Dnn.Extensions.Utilities;
+using R7.Dnn.Extensions.Controls;
+using R7.Dnn.Extensions.FileSystem;
+using R7.Dnn.Extensions.Text;
 using R7.University.Controls.EditModels;
 using R7.University.Controls.SerializationModels;
 using R7.University.ModelExtensions;
@@ -75,6 +76,11 @@ public void OnInit (PortalModuleBase module, IEnumerable<AchievementTypeInfo> ac
  comboAchievementTypes.DataBind ();
  comboAchievementTypes.InsertDefaultItem (LocalizeString ("NotSelected.Text"));
  comboAchievementTypes.SelectedIndex = 0;
+
+ var lastFolderId = FolderHistory.GetLastFolderId (Request, Module.PortalId);
+ if (lastFolderId != null) {
+ urlDocumentURL.SelectFolder (lastFolderId.Value);
+ }
  }
 
  protected override void OnLoad (EventArgs e)
@@ -126,11 +132,11 @@ protected override void OnLoadItem (EmployeeAchievementEditModel item)
 
  protected override void OnUpdateItem (EmployeeAchievementEditModel item)
  {
- item.AchievementID = TypeUtils.ParseToNullable<int> (comboAchievement.SelectedValue);
+ item.AchievementID = ParseHelper.ParseToNullable<int> (comboAchievement.SelectedValue, true);
  if (item.AchievementID == null) {
  item.Title = textAchievementTitle.Text.Trim ();
  item.ShortTitle = textAchievementShortTitle.Text.Trim ();
- item.AchievementTypeId = TypeUtils.ParseToNullable<int> (comboAchievementTypes.SelectedValue);
+ item.AchievementTypeId = ParseHelper.ParseToNullable<int> (comboAchievementTypes.SelectedValue, true);
  var achievementType = GetAchievementType (item.AchievementTypeId);
  item.Type = (achievementType != null)? achievementType.Type : string.Empty;
  }
@@ -147,15 +153,17 @@ protected override void OnUpdateItem (EmployeeAchievementEditModel item)
  item.TitleSuffix = textAchievementTitleSuffix.Text.Trim ();
  item.Description = textAchievementDescription.Text.Trim ();
  item.IsTitle = checkIsTitle.Checked;
- item.YearBegin = TypeUtils.ParseToNullable<int> (textYearBegin.Text);
- item.YearEnd = TypeUtils.ParseToNullable<int> (textYearEnd.Text);
+ item.YearBegin = ParseHelper.ParseToNullable<int> (textYearBegin.Text);
+ item.YearEnd = ParseHelper.ParseToNullable<int> (textYearEnd.Text);
  item.DocumentURL = urlDocumentURL.Url;
+
+ FolderHistory.RememberFolderByFileUrl (Request, Response, urlDocumentURL.Url, Module.PortalId);
  }
 
  protected override void OnCancelEdit (EmployeeAchievementEditModel item)
  {
  // fix for DnnUrlControl looses its state on postback
- urlDocumentURL.Url = item.DocumentURL;
+ // urlDocumentURL.Url = item.DocumentURL;
 
  base.OnCancelEdit (item);
  }

diff --git a/R7.University.Controls/EditDisciplines.ascx b/R7.University.Controls/EditDisciplines.ascx
@@ -81,6 +81,7 @@
  CssClass="dnnPrimaryAction" CommandArgument="Update" 
  CausesValidation="true" ValidationGroup="Disciplines" />
  </li>
+ <li>&nbsp;</li>
  <li>
  <asp:LinkButton id="buttonCancelEditItem" runat="server" resourcekey="CancelEdit" 
  CssClass="dnnSecondaryAction" />

diff --git a/R7.University.Controls/EditDisciplines.ascx.cs b/R7.University.Controls/EditDisciplines.ascx.cs
@@ -4,7 +4,7 @@
 // Author:
 // Roman M. Yagodin <[email protected]>
 //
-// Copyright (c) 2017 Roman M. Yagodin
+// Copyright (c) 2017-2018 Roman M. Yagodin
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -24,7 +24,7 @@
 using System.Linq;
 using DotNetNuke.Common.Utilities;
 using DotNetNuke.Entities.Modules;
-using R7.Dnn.Extensions.ControlExtensions;
+using R7.Dnn.Extensions.Controls;
 using R7.University.ControlExtensions;
 using R7.University.Controls.EditModels;
 using R7.University.Controls.Queries;
@@ -97,7 +97,7 @@ protected override void OnUpdateItem (EmployeeDisciplineEditModel item)
  item.ProfileTitle = profile.ProfileTitle;
  item.ProfileStartDate = profile.StartDate;
  item.ProfileEndDate = profile.EndDate;
- item.EduLevelString = FormatHelper.FormatShortTitle (profile.EduLevel.ShortTitle, profile.EduLevel.Title);
+ item.EduLevelString = UniversityFormatHelper.FormatShortTitle (profile.EduLevel.ShortTitle, profile.EduLevel.Title);
  }
  }
 

diff --git a/R7.University.Controls/EditDivisions.ascx b/R7.University.Controls/EditDivisions.ascx
@@ -65,6 +65,7 @@
  CssClass="dnnPrimaryAction" CommandArgument="Update" 
  CausesValidation="true" ValidationGroup="EduProgramDivisions" />
  </li>
+ <li>&nbsp;</li>
  <li>
  <asp:LinkButton id="buttonCancelEditItem" runat="server" resourcekey="CancelEdit" 
  CssClass="dnnSecondaryAction" />

diff --git a/R7.University.Controls/EditDivisions.ascx.cs b/R7.University.Controls/EditDivisions.ascx.cs
@@ -4,7 +4,7 @@
 // Author:
 // Roman M. Yagodin <[email protected]>
 //
-// Copyright (c) 2017 Roman M. Yagodin
+// Copyright (c) 2017-2018 Roman M. Yagodin
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -59,7 +59,7 @@ protected override void OnUpdateItem (EduProgramDivisionEditModel item)
  item.DivisionRole = textDivisionRole.Text.Trim ();
 
  using (var modelContext = new UniversityModelContext ()) {
- var division = modelContext.Get<DivisionInfo> (item.DivisionId);
+ var division = modelContext.Get<DivisionInfo,int> (item.DivisionId);
  item.StartDate = division.StartDate;
  item.EndDate = division.EndDate;
  item.DivisionTitle = division.Title;

diff --git a/R7.University.Controls/EditDocuments.ascx b/R7.University.Controls/EditDocuments.ascx
@@ -105,7 +105,8 @@
  <asp:LinkButton id="buttonUpdateItem" runat="server" resourcekey="buttonUpdateDocument" 
  CssClass="dnnPrimaryAction" CommandArgument="Update"
  CausesValidation="true" ValidationGroup="Documents" />
- </li> 
+ </li>
+ <li>&nbsp;</li>
  <li>
  <asp:LinkButton id="buttonCancelEditItem" runat="server" resourcekey="CancelEdit" 
  CssClass="dnnSecondaryAction" />

diff --git a/R7.University.Controls/EditDocuments.ascx.cs b/R7.University.Controls/EditDocuments.ascx.cs
@@ -4,7 +4,7 @@
 // Author:
 // Roman M. Yagodin <[email protected]>
 //
-// Copyright (c) 2015-2017 Roman M. Yagodin
+// Copyright (c) 2015-2018 Roman M. Yagodin
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -28,8 +28,9 @@
 using DotNetNuke.Entities.Modules;
 using DotNetNuke.Entities.Tabs;
 using DotNetNuke.Services.Localization;
-using R7.Dnn.Extensions.ControlExtensions;
-using R7.Dnn.Extensions.Utilities;
+using R7.Dnn.Extensions.Controls;
+using R7.Dnn.Extensions.FileSystem;
+using R7.Dnn.Extensions.Text;
 using R7.University.Controls.EditModels;
 using R7.University.Models;
 
@@ -65,6 +66,11 @@ public void OnInit (PortalModuleBase module, IEnumerable<DocumentTypeInfo> docum
 
  comboDocumentType.Attributes.Add ("data-validation", $"[{filenameFormats}]");
  valDocumentUrl.Attributes.Add ("data-message-template", Localization.GetString ("FileName.Invalid", LocalResourceFile));
+
+ var lastFolderId = FolderHistory.GetLastFolderId (Request, Module.PortalId);
+ if (lastFolderId != null) {
+ urlDocumentUrl.SelectFolder (lastFolderId.Value);
+ }
  }
 
  protected override void OnLoad (EventArgs e)
@@ -115,10 +121,12 @@ protected override void OnUpdateItem (DocumentEditModel item)
  item.Group = textDocumentGroup.Text.Trim ();
  item.DocumentTypeID = int.Parse (comboDocumentType.SelectedValue);
  item.DocumentTypeViewModel = GetDocumentType (item.DocumentTypeID);
- item.SortIndex = TypeUtils.ParseToNullable<int> (textDocumentSortIndex.Text) ?? 0;
+ item.SortIndex = ParseHelper.ParseToNullable<int> (textDocumentSortIndex.Text) ?? 0;
  item.StartDate = datetimeDocumentStartDate.SelectedDate;
  item.EndDate = datetimeDocumentEndDate.SelectedDate;
  item.Url = urlDocumentUrl.Url;
+
+ FolderHistory.RememberFolderByFileUrl (Request, Response, urlDocumentUrl.Url, Module.PortalId);
  }
 
  protected override void OnResetForm ()

diff --git a/R7.University.Controls/EditEduFormYears.ascx b/R7.University.Controls/EditEduFormYears.ascx
@@ -103,6 +103,7 @@
  CssClass="dnnPrimaryAction" CommandArgument="Update" 
  CausesValidation="true" ValidationGroup="EduProgramProfileFormYears" />
  </li>
+ <li>&nbsp;</li>
  <li>
  <asp:LinkButton id="buttonCancelEditItem" runat="server" resourcekey="CancelEdit" 
  CssClass="dnnSecondaryAction" />

diff --git a/R7.University.Controls/EditEduFormYears.ascx.cs b/R7.University.Controls/EditEduFormYears.ascx.cs
@@ -23,7 +23,8 @@
 using System.Linq;
 using DotNetNuke.Common.Utilities;
 using DotNetNuke.Entities.Modules;
-using R7.Dnn.Extensions.ControlExtensions;
+using R7.Dnn.Extensions.Controls;
+using R7.Dnn.Extensions.Text;
 using R7.Dnn.Extensions.Utilities;
 using R7.University.Controls.EditModels;
 using R7.University.ModelExtensions;
@@ -100,7 +101,7 @@ protected override void OnLoadItem (EduProgramProfileFormYearEditModel item)
 
  protected override void OnUpdateItem (EduProgramProfileFormYearEditModel item)
  {
- item.YearId = TypeUtils.ParseToNullable<int> (comboYear.SelectedValue);
+ item.YearId = ParseHelper.ParseToNullable<int> (comboYear.SelectedValue, true);
  item.YearString = GetYear (item.YearId).FormatWithCourse (GetLastYear ());
 
  item.EduFormId = int.Parse (radioEduForm.SelectedValue);

diff --git a/R7.University.Controls/EditEduForms.ascx b/R7.University.Controls/EditEduForms.ascx
@@ -111,6 +111,7 @@
  CssClass="dnnPrimaryAction" CommandArgument="Update" 
  CausesValidation="true" ValidationGroup="EduProgramProfileForms" />
  </li>
+ <li>&nbsp;</li>
  <li>
  <asp:LinkButton id="buttonCancelEditItem" runat="server" resourcekey="CancelEdit" 
  CssClass="dnnSecondaryAction" />

diff --git a/R7.University.Controls/EditEduForms.ascx.cs b/R7.University.Controls/EditEduForms.ascx.cs
@@ -4,7 +4,7 @@
 // Author:
 // Roman M. Yagodin <[email protected]>
 //
-// Copyright (c) 2015-2017 Roman M. Yagodin
+// Copyright (c) 2015-2018 Roman M. Yagodin
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -23,7 +23,7 @@
 using System.Linq;
 using DotNetNuke.Common.Utilities;
 using DotNetNuke.Entities.Modules;
-using R7.Dnn.Extensions.ControlExtensions;
+using R7.Dnn.Extensions.Controls;
 using R7.University.Controls.EditModels;
 using R7.University.Models;
 

diff --git a/R7.University.Controls/EditModels/DocumentEditModel.cs b/R7.University.Controls/EditModels/DocumentEditModel.cs
@@ -26,14 +26,12 @@
 using DotNetNuke.Services.FileSystem;
 using DotNetNuke.Services.Localization;
 using Newtonsoft.Json;
-using R7.Dnn.Extensions.Utilities;
+using R7.Dnn.Extensions.Models;
 using R7.Dnn.Extensions.ViewModels;
-using R7.University.Controls.ViewModels;
 using R7.University.EditModels;
 using R7.University.ModelExtensions;
 using R7.University.Models;
 using R7.University.Utilities;
-using R7.University.ViewModels;
 
 namespace R7.University.Controls.EditModels
 {
@@ -84,7 +82,7 @@ public override void SetTargetItemId (int targetItemId, string targetItemKey)
 
  [JsonIgnore]
  [Obsolete ("Use DocumentTypeViewModel property instead", true)] 
- public DocumentTypeInfo DocumentType { get; set; }
+ public IDocumentType DocumentType { get; set; }
 
  public DocumentTypeViewModel DocumentTypeViewModel { get; set; }
 

diff --git a/R7.University.Controls/EditModels/EduProgramDivisionEditModel.cs b/R7.University.Controls/EditModels/EduProgramDivisionEditModel.cs
@@ -78,7 +78,7 @@ public override void SetTargetItemId (int targetItemId, string targetItemKey)
  public int DivisionId { get; set; }
 
  [JsonIgnore]
- public DivisionInfo Division { get; set; }
+ public IDivision Division { get; set; }
 
  public string DivisionRole { get; set; }