bjquanjiang
/
DigitalScholl
1
0
Bifurcation 0
Code Tickets 0 Demandes d'ajout 0 Versions 0 Wiki Activité
Parcourir la source

成绩录入优化

新疆影视学院高职^2
zhangli il y a 2 ans
Parent
9fe90cad7e
révision
fdd32ea312
8 fichiers modifiés avec 86 ajouts et 5 suppressions
Vue séparée
Option de Diff
Voir les Statistiques Télécharger le Fichier Patch Télécharger le Fichier des Différences
  1. +8
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js
  2. +9
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js
  3. +9
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js
  4. +7
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js
  5. +28
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
  6. +13
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs
  7. +6
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs
  8. +6
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs

+ 8
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js Voir le fichier

@@ -315,6 +315,10 @@ var bootstrap = function ($, learun) {
$('#lr_save').show();
//隐藏“开始录入”按钮
$('#lr_input').hide();
//隐藏“提交教务处”、“去审核成绩”、“设置成绩比例”按钮
$('#lr_check').hide();
$('#lr_uncheck').hide();
$('#lr_setScale').hide();
//显示“倒计时”
$('.timeBox').show();
$('#minutes').html($('#minutes').attr('data-minutes'));
@@ -371,6 +375,10 @@ var bootstrap = function ($, learun) {
$('#lr_save').hide();
//显示“开始录入”按钮
$('#lr_input').show();
//显示“提交教务处”、“去审核成绩”、“设置成绩比例”按钮
$('#lr_check').show();
$('#lr_uncheck').show();
$('#lr_setScale').show();
//隐藏“倒计时”
$('.timeBox').hide();
//停止倒计时


+ 9
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js Voir le fichier

@@ -313,6 +313,10 @@ var bootstrap = function ($, learun) {
$('#lr_save').show();
//隐藏“开始录入”按钮
$('#lr_input').hide();
//隐藏“提交教务处”、“去审核成绩”按钮
$('#lr_check').hide();
$('#lr_uncheck').hide();
$('#lr_setScale').hide();
//显示“倒计时”
$('.timeBox').show();
$('#minutes').html($('#minutes').attr('data-minutes'));
@@ -369,6 +373,10 @@ var bootstrap = function ($, learun) {
$('#lr_save').hide();
//显示“开始录入”按钮
$('#lr_input').show();
//显示“提交教务处”、“去审核成绩”、“设置成绩比例”按钮
$('#lr_check').show();
$('#lr_uncheck').show();
$('#lr_setScale').show();
//隐藏“倒计时”
$('.timeBox').hide();
//停止倒计时
@@ -522,7 +530,7 @@ var bootstrap = function ($, learun) {
refreshGirdData2();
}
});
} else {
learun.alert.warning("学生成绩不存在！");
return false;


+ 9
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js Voir le fichier

@@ -134,7 +134,7 @@ var bootstrap = function ($, learun) {
];
headDataEdit = [
{
label: '补考成绩', name: 'TermEndScore', width: 80, align: "left",
label: '期末成绩', name: 'TermEndScore', width: 80, align: "left",
edit: {
type: 'input',
inputType: 'number',
@@ -215,6 +215,9 @@ var bootstrap = function ($, learun) {
$('#lr_save').show();
//隐藏“开始录入”按钮
$('#lr_input').hide();
//隐藏“提交教务处”、“去审核成绩”按钮
$('#lr_check').hide();
$('#lr_uncheck').hide();
//显示“倒计时”
$('.timeBox').show();
$('#minutes').html($('#minutes').attr('data-minutes'));
@@ -270,6 +273,9 @@ var bootstrap = function ($, learun) {
$('#lr_save').hide();
//显示“开始录入”按钮
$('#lr_input').show();
//显示“提交教务处”、“去审核成绩”按钮
$('#lr_check').show();
$('#lr_uncheck').show();
//隐藏“倒计时”
$('.timeBox').hide();
//停止倒计时
@@ -392,7 +398,7 @@ var bootstrap = function ($, learun) {
learun.alert.warning("当前班级成绩由账号为" + data.EditUserId + "的教师在使用！");
return false;
}
}
}

rowJson = $('#gridtable').jfGridGet('showData');
columnJson = $('#gridtable').jfGridGet('settingInfo').headData;
@@ -414,7 +420,7 @@ var bootstrap = function ($, learun) {
}
});

} else {
learun.alert.warning("学生成绩不存在！");
return false;


+ 7
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js Voir le fichier

@@ -134,7 +134,7 @@ var bootstrap = function ($, learun) {
];
headDataEdit = [
{
label: '补考成绩', name: 'TermEndScore', width: 80, align: "left",
label: '期末成绩', name: 'TermEndScore', width: 80, align: "left",
edit: {
type: 'input',
inputType: 'number',
@@ -215,6 +215,9 @@ var bootstrap = function ($, learun) {
$('#lr_save').show();
//隐藏“开始录入”按钮
$('#lr_input').hide();
//隐藏“提交教务处”、“去审核成绩”按钮
$('#lr_check').hide();
$('#lr_uncheck').hide();
//显示“倒计时”
$('.timeBox').show();
$('#minutes').html($('#minutes').attr('data-minutes'));
@@ -270,6 +273,9 @@ var bootstrap = function ($, learun) {
$('#lr_save').hide();
//显示“开始录入”按钮
$('#lr_input').show();
//显示“提交教务处”、“去审核成绩”按钮
$('#lr_check').show();
$('#lr_uncheck').show();
//隐藏“倒计时”
$('.timeBox').hide();
//停止倒计时


+ 28
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj Voir le fichier

@@ -8086,8 +8086,36 @@
<Content Include="wsbsdt\layui\font\iconfont.eot" />
<Content Include="wsbsdt\layui\font\iconfont.ttf" />
<Content Include="wsbsdt\layui\font\iconfont.woff" />
<None Include="Properties\PublishProfiles\FolderProfile10.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile11.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile12.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile13.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile14.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile15.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile16.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile17.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile18.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile19.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile2.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile20.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile21.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile22.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile23.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile24.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile25.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile26.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile27.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile28.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile29.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile3.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile30.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile31.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile32.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile33.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile34.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile35.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile36.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile37.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile4.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile5.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile6.pubxml" />


+ 13
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs Voir le fichier

@@ -2332,6 +2332,12 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
var TermInScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["期中成绩"].ToString().Trim()) ? "0" : dr["期中成绩"].ToString().Trim());
var TermEndScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["期末成绩"].ToString().Trim()) ? "0" : dr["期末成绩"].ToString().Trim());
var OtherScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["其他成绩"].ToString().Trim()) ? "0" : dr["其他成绩"].ToString().Trim());
if (OrdinaryScore < 0 || TermInScore < 0 || TermEndScore < 0 || OtherScore < 0)
{
dr["导入错误"] = "成绩必须大于0！";
failDt.Rows.Add(dr.ItemArray);
continue;
}
var Score = Math.Round(Convert.ToDouble(OrdinaryScore * (stuSelectLessonListEntity.OrdinaryScoreScale / 100) +
TermInScore * (stuSelectLessonListEntity.TermInScoreScale / 100) +
TermEndScore * (stuSelectLessonListEntity.TermEndScoreScale / 100) +
@@ -2481,6 +2487,13 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
var TermInScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["期中成绩"].ToString().Trim()) ? "0" : dr["期中成绩"].ToString().Trim());
var TermEndScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["期末成绩"].ToString().Trim()) ? "0" : dr["期末成绩"].ToString().Trim());
var OtherScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["其他成绩"].ToString().Trim()) ? "0" : dr["其他成绩"].ToString().Trim());
if (OrdinaryScore < 0 || TermInScore < 0 || TermEndScore < 0 || OtherScore < 0)
{
dr["导入错误"] = "成绩必须大于0！";
failDt.Rows.Add(dr.ItemArray);
continue;
}

var Score = Math.Round(Convert.ToDouble(OrdinaryScore * (stuSelectLessonListOfElectiveEntity.OrdinaryScoreScale / 100) +
TermInScore * (stuSelectLessonListOfElectiveEntity.TermInScoreScale / 100) +
TermEndScore * (stuSelectLessonListOfElectiveEntity.TermEndScoreScale / 100) +


+ 6
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs Voir le fichier

@@ -881,6 +881,12 @@ order by bb.ScoreId";
continue;
}
var TermEndScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["期末成绩"].ToString().Trim()) ? "0" : dr["期末成绩"].ToString().Trim());
if (TermEndScore < 0)
{
dr["导入错误"] = "成绩必须大于0！";
failDt.Rows.Add(dr.ItemArray);
continue;
}
var Score = Math.Round(TermEndScore, MidpointRounding.AwayFromZero);
var remark = dr["备注"].ToString().Trim();
db.ExecuteBySql($"update StuScoreNotPass set TermEndScore={TermEndScore},Score={Score},Remark='{remark}' where ScoreId='{item.ScoreId}' ");


+ 6
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs Voir le fichier

@@ -929,6 +929,12 @@ order by bb.ScoreId";
continue;
}
var TermEndScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["期末成绩"].ToString().Trim()) ? "0" : dr["期末成绩"].ToString().Trim());
if (TermEndScore < 0)
{
dr["导入错误"] = "成绩必须大于0！";
failDt.Rows.Add(dr.ItemArray);
continue;
}
var Score = Math.Round(TermEndScore, MidpointRounding.AwayFromZero);
var remark = dr["备注"].ToString().Trim();
db.ExecuteBySql($"update StuScoreNotPassTwo set TermEndScore={TermEndScore},Score={Score},Remark='{remark}' where ScoreId='{item.ScoreId}' ");


Écrire Aperçu
Chargement…
Annuler
Enregistrer