administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Правки рейтинга в TeacherPlugin

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2024-09-07 23:11:54 +03:00
parent 2365eb3633
commit a6f6d8a90b
6 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3"; public const string Major = "3";
public const string Minor = "10"; public const string Minor = "10";
public const string Build = "0"; public const string Build = "0";
public const string Revision = "3536"; public const string Revision = "3537";
public const string MainVersion = Major + "." + Minor; public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=0
%REVISION%=3536
%MINOR%=10 %MINOR%=10
%REVISION%=3537
%COREVERSION%=0
%MAJOR%=3 %MAJOR%=3

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.10.0.3536 3.10.0.3537

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.10.0.3536' !define VERSION '3.10.0.3537'

9
VisualPlugins/TraningControlPlugin/LoginForm.cs
View file

@ -240,9 +240,10 @@ namespace DBAccessPluginNamespace
public void SetRating(string rating) public void SetRating(string rating)
{ {
var ss = rating.Split('|'); /*var ss = rating.Split('|');
labelRating.Text = $"Рейтинг: {ss[0]} баллов"; labelRating.Text = $"Рейтинг: {ss[0]} баллов";
labelDetails.Text = ss[1]; labelDetails.Text = ss[1];*/
labelRating.Text = $"Рейтинг: {rating} баллов";
} }
public void ChangeControlsAfterLogin(string login) public void ChangeControlsAfterLogin(string login)
{ {
@ -260,12 +261,12 @@ namespace DBAccessPluginNamespace
usersNamesBox.Enabled = false; usersNamesBox.Enabled = false;
Authorized = true; Authorized = true;
Plugin.toolStripButton.ToolTipText = "Авторизация выполнена: " + login; Plugin.toolStripButton.ToolTipText = "Авторизация выполнена: " + login;
Plugin.toolStripButton.Image = PluginImageAuthorized.Image;
Plugin.menuItem.Image = PluginImageAuthorized.Image;
this.Icon = VisualPascalABCPlugins.Properties.Resources.IconAuthorized; this.Icon = VisualPascalABCPlugins.Properties.Resources.IconAuthorized;
closeButton.Focus(); closeButton.Focus();
panelUnAuthorized.SendToBack(); panelUnAuthorized.SendToBack();
labelUserName.Text = login; labelUserName.Text = login;
Plugin.toolStripButton.Image = PluginImageAuthorized.Image;
Plugin.menuItem.Image = PluginImageAuthorized.Image;
//labelRating.Text = "Рейтинг: "; //labelRating.Text = "Рейтинг: ";
} }
catch (Exception e) catch (Exception e)

13
VisualPlugins/TraningControlPlugin/SiteAccessInfo.cs
View file

@ -239,6 +239,7 @@ namespace DBAccessPluginNamespace
var ControlTasksSolved = 0; var ControlTasksSolved = 0;
var HomeworkTasksSolved = 0; var HomeworkTasksSolved = 0;
var AdditionalTasksSolved = 0; var AdditionalTasksSolved = 0;
var totalRating = 0;
try try
{ {
foreach (var s in pieces) foreach (var s in pieces)
@ -247,7 +248,7 @@ namespace DBAccessPluginNamespace
var pair = s.Split(':'); var pair = s.Split(':');
switch (pair[0]) switch (pair[0])
{ {
case "ClassTasks": /*case "ClassTasks":
ClassTasksSolved = int.Parse(pair[2]); ClassTasksSolved = int.Parse(pair[2]);
break; break;
case "ControlTasks": case "ControlTasks":
@ -258,13 +259,17 @@ namespace DBAccessPluginNamespace
break; break;
case "AdditionalTasks": case "AdditionalTasks":
AdditionalTasksSolved = int.Parse(pair[2]); AdditionalTasksSolved = int.Parse(pair[2]);
break;*/
case "Total":
totalRating = int.Parse(pair[1]);
break; break;
} }
} }
// великая формула !!! // великая формула !!!
var Rating = ClassTasksSolved * 1 + ControlTasksSolved * 5 + HomeworkTasksSolved * 3 + AdditionalTasksSolved * 2; //var Rating = ClassTasksSolved * 1 + ControlTasksSolved * 5 + HomeworkTasksSolved * 3 + AdditionalTasksSolved * 2;
var Details = $" (Осн: {ClassTasksSolved}×1, Доп: {AdditionalTasksSolved}×2, ДЗ: {HomeworkTasksSolved}×3, КР: {ControlTasksSolved}×5)"; var Rating = totalRating;
res = Rating.ToString() + '|' + Details; //var Details = $" (Осн: {ClassTasksSolved}×1, Доп: {AdditionalTasksSolved}×2, ДЗ: {HomeworkTasksSolved}×3, КР: {ControlTasksSolved}×5)";
res = Rating.ToString(); // + '|' + Details;
} }
catch (Exception e) catch (Exception e)
{ {