diff --git a/R7.University.EduProgramProfiles/ViewEduProgramProfileDirectory.ascx b/R7.University.EduProgramProfiles/ViewEduProgramProfileDirectory.ascx index 0f3d4407..86286f4e 100644 --- a/R7.University.EduProgramProfiles/ViewEduProgramProfileDirectory.ascx +++ b/R7.University.EduProgramProfiles/ViewEduProgramProfileDirectory.ascx @@ -29,7 +29,7 @@ - + diff --git a/R7.University.EduProgramProfiles/ViewEduProgramProfileDirectory.ascx.cs b/R7.University.EduProgramProfiles/ViewEduProgramProfileDirectory.ascx.cs index bbcad69a..57aa1b45 100644 --- a/R7.University.EduProgramProfiles/ViewEduProgramProfileDirectory.ascx.cs +++ b/R7.University.EduProgramProfiles/ViewEduProgramProfileDirectory.ascx.cs @@ -147,9 +147,6 @@ protected override void OnInit (EventArgs e) { base.OnInit (e); - gridEduProfileObrnadzorEduForms.Attributes.Add ("itemprop", "eduAccred"); - gridEduProfileObrnadzorDocuments.Attributes.Add ("itemprop", "eduOP"); - switch (Settings.Mode) { case EduProgramProfileDirectoryMode.ObrnadzorEduForms: mviewEduProgramProfileDirectory.ActiveViewIndex = 1; @@ -236,6 +233,7 @@ protected void gridEduProfileObrnadzorEduForms_RowDataBound (object sender, Grid if (e.Row.RowType == DataControlRowType.DataRow) { var eduProgramProfile = (EduProgramProfileEduFormsViewModel) e.Row.DataItem; + e.Row.Attributes.Add ("itemprop", "eduAccred"); if (IsEditable) { // get edit link controls @@ -268,6 +266,7 @@ protected void gridEduProfileObrnadzorDocuments_RowDataBound (object sender, Gri else if (e.Row.RowType == DataControlRowType.DataRow) { var eduProgramProfile = (EduProfileDocumentsViewModel) e.Row.DataItem; + e.Row.Attributes.Add ("itemprop", "eduOP"); e.Row.Attributes.Add ("data-title", UniversityFormatHelper.FormatEduProfileTitle ( eduProgramProfile.EduProgram.Code, eduProgramProfile.EduProgram.Title, eduProgramProfile.ProfileCode, eduProgramProfile.ProfileTitle) diff --git a/R7.University.EduProgramProfiles/ViewModels/EduProgramProfileEduFormsViewModel.cs b/R7.University.EduProgramProfiles/ViewModels/EduProgramProfileEduFormsViewModel.cs index 7a2244b4..63abfc3b 100644 --- a/R7.University.EduProgramProfiles/ViewModels/EduProgramProfileEduFormsViewModel.cs +++ b/R7.University.EduProgramProfiles/ViewModels/EduProgramProfileEduFormsViewModel.cs @@ -49,6 +49,10 @@ public EduProgramProfileEduFormsViewModel ( ? Wrap (AccreditedToDate.Value.ToShortDateString (), "dateEnd") : string.Empty; + public string CommunityAccreditedToDateString => (CommunityAccreditedToDate != null) + ? Wrap (Wrap (CommunityAccreditedToDate.Value.ToShortDateString (), "dateEnd"), "eduPOAccred") + : string.Empty; + public string EduForms_String { get {