diff --git a/app/controllers/weapps/attendances_controller.rb b/app/controllers/weapps/attendances_controller.rb index 567bfae77..6804f0ce4 100644 --- a/app/controllers/weapps/attendances_controller.rb +++ b/app/controllers/weapps/attendances_controller.rb @@ -27,14 +27,16 @@ class Weapps::AttendancesController < ApplicationController tip_exception(403) if @user_course_identity >= Course::STUDENT current_date = Date.current current_end_time = Time.current.strftime("%H:%M:%S") - @current_attendance = @course.course_attendances.where("attendance_date = '#{current_date}' and start_time <= '#{current_end_time}' and end_time > '#{current_end_time}'").take + @current_attendance = @course.course_attendances.where("attendance_date = '#{current_date}' and end_time > '#{current_end_time}'").take - all_attendances = @course.course_attendances + all_attendances = @course.course_attendances.where("attendance_date < '#{current_date}' or (attendance_date = '#{current_date}' and end_time < '#{current_end_time}')") + @all_member_attendances = CourseMemberAttendance.where(course_attendance_id: all_attendances) if params[:group_id].present? - all_attendances = all_attendances.where(course_group_id: [params[:group_id], 0]) + all_attendances = all_attendances.joins(:course_attendance_groups).where(course_attendance_groups: {course_group_id: [params[:group_id], 0]}) + @all_member_attendances = @all_member_attendances.joins(:course_member).where(course_members: {course_group_id: params[:group_id]}) end - @history_attendances = all_attendances.where("attendance_date < '#{current_date}' or (attendance_date = '#{current_date}' and end_time < '#{current_end_time}')").order("id asc") + @history_attendances = all_attendances.order("id asc") @all_history_count = @history_attendances.size end diff --git a/app/helpers/weapps/attendances_helper.rb b/app/helpers/weapps/attendances_helper.rb index 60a9cfe26..30591c149 100644 --- a/app/helpers/weapps/attendances_helper.rb +++ b/app/helpers/weapps/attendances_helper.rb @@ -9,4 +9,12 @@ module Weapps::AttendancesHelper course_member_ids = group.course_members.pluck(:id) attendances.select{|attendance| course_member_ids.include?(attendance.course_member_id) && attendance.attendance_status == "NORMAL"}.size end + + def history_member_count member_attendances, status, attendance_id + member_attendances.select{|member_attendance| member_attendance.attendance_status == status && member_attendance.course_attendance_id == attendance_id}.size + end + + def cal_rate base, sum + sum == 0 ? 0 : (base.to_f / sum) + end end \ No newline at end of file diff --git a/app/views/weapps/attendances/index.json.jbuilder b/app/views/weapps/attendances/index.json.jbuilder index 9541fe231..bff2e1218 100644 --- a/app/views/weapps/attendances/index.json.jbuilder +++ b/app/views/weapps/attendances/index.json.jbuilder @@ -1,11 +1,21 @@ json.current_attendance do - json.(@current_attendance, :id, :normal_count, :all_count) + json.(@current_attendance, :id, :normal_count, :all_count) if @current_attendance end -json.history_attendances @history_attendances do |attendance| +all_normal_rate = [] +all_absence_rate = [] +json.history_attendances @history_attendances.each_with_index.to_a do |attendance, index| + normal_count = history_member_count(@all_member_attendances, "NORMAL", attendance.id) + absence_count = history_member_count(@all_member_attendances, "ABSENCE", attendance.id) + all_count = @all_member_attendances.select{|member_attendance| member_attendance.course_attendance_id == attendance.id}.size + + json.index index + 1 + json.normal_rate cal_rate(normal_count, all_count) + all_normal_rate << cal_rate(normal_count, all_count) + json.absence_rate cal_rate(absence_count, all_count) + all_absence_rate << cal_rate(absence_count, all_count) end json.all_history_count @all_history_count -json.normal_count @normal_count -json.leave_count @leave_count -json.absence_count @absence_count \ No newline at end of file +json.avg_normal_rate @all_history_count == 0 ? 0 : all_normal_rate.sum / @all_history_count +json.avg_absence_rate @all_history_count == 0 ? 0 : all_absence_rate.sum / @all_history_count diff --git a/app/views/weapps/attendances/show.json.jbuilder b/app/views/weapps/attendances/show.json.jbuilder index fa725a878..4b16b1f72 100644 --- a/app/views/weapps/attendances/show.json.jbuilder +++ b/app/views/weapps/attendances/show.json.jbuilder @@ -3,6 +3,7 @@ json.leave_count @leave_count json.absence_count @absence_count json.all_count @all_count json.code @attendance.attendance_code +json.mode @attendance.mode json.edit_auth @user_course_identity < Course::PROFESSOR || @attendance.user_id == User.current.id json.course_groups @groups do |group| json.(group, :id, :name, :course_members_count) diff --git a/public/react/src/App.js b/public/react/src/App.js index 4c4908771..288afcb10 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -793,37 +793,37 @@ class App extends Component { render={ (props) => () }/> - () - }/> + {/* ()*/} + {/* }/>*/} - () - }/> + {/* ()*/} + {/* }/>*/} () } /> - () - } /> - - () - } /> - () - } /> - () - }/> + {/* ()*/} + {/* } />*/} + + {/* ()*/} + {/* } />*/} + {/* ()*/} + {/* } />*/} + {/* ()*/} + {/* }/>*/} () }/> - () - }/> + {/* ()*/} + {/* }/>*/} + + + {/*()*/} {/* }*/} {/*/>*/} + { - debugger; axios.post(url, {name:value}).then((result)=>{ if(result!=undefined){ diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js index 2e2487601..b0c65009d 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js @@ -228,7 +228,7 @@ class GraduateTopicDetailTable extends Component{ { return 11 ? name : ''} onClick={() => onGoDetail(record)} style={''} - className="overflowHidden1" style2={{maxWidth: '180px', verticalAlign: 'bottom'}}> + className="overflowHidden1 color-dark" style2={{maxWidth: '180px', verticalAlign: 'bottom'}}> {name} } }, @@ -154,7 +154,7 @@ function CourseGroupListTable(props) { {!isCourseEnd && isAdmin && onDelete(record)} style={'grey'}>删除分班} {isStudent && addToDir(record)} style={''}>加入分班} - onGoDetail(record)} style={''}>查看 + onGoDetail(record)} style={''} className="color-dark">查看 } }) diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js index 64cc373dc..05a9e55ff 100644 --- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js +++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js @@ -1,48 +1,30 @@ -import React, {Component} from 'react'; +import React, { Component } from 'react'; -import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd'; - -import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom"; - -// import "antd/dist/antd.css"; - -import { getImageUrl, getUploadActionUrl, getUrl } from 'educoder'; +import { getUploadActionUrl, getUrl } from 'educoder'; import '../../courses/css/Courses.css' -import axios from 'axios'; - import './css/TPMchallengesnew.css'; require('codemirror/lib/codemirror.css'); -let origin = getUrl(); let path = '/editormd/lib/' - path = getUrl("/editormd/lib/") +path = getUrl("/editormd/lib/") const $ = window.$; -let timeout; - -let currentValue; - -const Option = Select.Option; - -const RadioGroup = Radio.Group; - - // 保存数据 -function md_add_data(k,mdu,d){ - window.sessionStorage.setItem(k+mdu,d); +function md_add_data(k, mdu, d) { + window.sessionStorage.setItem(k + mdu, d); } // 清空保存的数据 -function md_clear_data(k,mdu,id){ - window.sessionStorage.removeItem(k+mdu); - var id1 = "#e_tip_"+id; - var id2 = "#e_tips_"+id; - if(k == 'content'){ +function md_clear_data(k, mdu, id) { + window.sessionStorage.removeItem(k + mdu); + var id1 = "#e_tip_" + id; + var id2 = "#e_tips_" + id; + if (k == 'content') { $(id2).html("　"); - }else{ + } else { $(id1).html("　"); } } @@ -59,16 +41,16 @@ function md_rec_data(k, mdu, id) { } window.md_rec_data = md_rec_data; -function md_elocalStorage(editor,mdu,id){ - if (window.sessionStorage){ - var oc = window.sessionStorage.getItem('content'+mdu); - if(oc !== null && oc != editor.getValue()){ - console.log("#e_tips_"+id) - $("#e_tips_"+id).data('editor', editor); - var h = '您上次有已保存的数据，是否恢复 ? / 不恢复'; - $("#e_tips_"+id).html(h); +function md_elocalStorage(editor, mdu, id) { + if (window.sessionStorage) { + var oc = window.sessionStorage.getItem('content' + mdu); + if (oc !== null && oc != editor.getValue()) { + console.log("#e_tips_" + id) + $("#e_tips_" + id).data('editor', editor); + var h = '您上次有已保存的数据，是否恢复 ? / 不恢复'; + $("#e_tips_" + id).html(h); } - setInterval(function() { + setInterval(function () { var d = new Date(); var h = d.getHours(); var m = d.getMinutes(); @@ -76,46 +58,46 @@ function md_elocalStorage(editor,mdu,id){ h = h < 10 ? '0' + h : h; m = m < 10 ? '0' + m : m; s = s < 10 ? '0' + s : s; - if(editor.getValue().trim() != ""){ - md_add_data("content",mdu,editor.getValue()); - var id1 = "#e_tip_"+id; - var id2 = "#e_tips_"+id; - + if (editor.getValue().trim() != "") { + md_add_data("content", mdu, editor.getValue()); + var id1 = "#e_tip_" + id; + var id2 = "#e_tips_" + id; + var textStart = " 数据已于 " - var text = textStart + h + ':' + m + ':' + s +" 保存 "; + var text = textStart + h + ':' + m + ':' + s + " 保存 "; // 占位符 var oldHtml = $(id2).html(); if (oldHtml && oldHtml != '　' && oldHtml.startsWith(textStart) == false) { - $(id2).html( oldHtml.split('　(')[0] + `　(${text})`); + $(id2).html(oldHtml.split('　(')[0] + `　(${text})`); } else { $(id2).html(text); } // $(id2).html(""); } - },10000); + }, 10000); - }else{ - $("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！'); + } else { + $("#e_tip_" + id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！'); } } -function create_editorMD(id, width, high, placeholder, imageUrl, callback, initValue, - onchange, watch, { noStorage, showNullButton, emoji }, that) { +function create_editorMD(id, width, high, placeholder, imageUrl, callback, initValue, + onchange, watch, { noStorage, showNullButton, emoji }, that) { // 还是出现了setting只有一份，被共用的问题 - + var editorName = window.editormd(id, { width: width, - height: high===undefined?400:high, - path: path, // "/editormd/lib/" - markdown : initValue, + height: high === undefined ? 400 : high, + path: getUrl("/editormd/lib/"), // "/editormd/lib/" + markdown: initValue, dialogLockScreen: false, - watch:watch===undefined?true:watch, + watch: watch === undefined ? true : watch, syncScrolling: "single", tex: true, tocm: true, - emoji: !!emoji , + emoji: !!emoji, taskList: true, codeFold: true, searchReplace: true, @@ -123,21 +105,35 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback, initV sequenceDiagram: true, autoFocus: false, - // mine - toolbarIcons: function (mdEditor) { let react_id = `react_${mdEditor.id}`; const __that = window[react_id] - - // Or return editormd.toolbarModes[name]; // full, simple, mini // Using "||" set icons align right. - const icons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]; + const icons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "line-break", "watch", "clear"]; // 试卷处用到的填空题新增按钮 if (__that.props.showNullButton) { icons.push('nullBtton') } return icons }, + toolbarIconsClass: { + "line-break": "fa-minus" + }, + toolbarHandlers: { + /** + * @param {Object} cm CodeMirror对象 + * @param {Object} icon 图标按钮jQuery元素对象 + * @param {Object} cursor CodeMirror的光标对象，可获取光标所在行和位置 + * @param {String} selection 编辑器选中的文本 + */ + "line-break": function (cm, icon, cursor, selection) { + // 如果当前没有选中的文本，将光标移到要输入的位置 + if (selection === "") { + cm.setCursor(cursor.line, cursor.ch + 1) + } + cm.replaceSelection("
"); + } + }, toolbarCustomIcons: { testIcon: "
", testIcon1: "
", @@ -152,14 +148,11 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback, initV imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"], imageUploadURL: imageUrl,//url onchange: onchange, - onload: function() { + onload: function () { let _id = this.id // 如果要使用this，这里不能使用箭头函数 let _editorName = this; let react_id = `react_${_editorName.id}`; const __that = window[react_id] - - // this.previewing(); - // let _id = id; $("#" + _id + " [type=\"latex\"]").bind("click", function () { _editorName.cm.replaceSelection("```latex"); _editorName.cm.replaceSelection("\n"); @@ -180,19 +173,12 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback, initV if (__that.props.showNullButton) { const NULL_CH = '▁' - // const NULL_CH = '〇' - // const NULL_CH = '🈳' - $("#" + _id + " [type=\"nullBtton\"]").bind("click", function () { _editorName.cm.replaceSelection(NULL_CH); - // var __Cursor = _editorName.cm.getDoc().getCursor(); - // _editorName.cm.setCursor(__Cursor.line - 1, 0); }); } - if (noStorage == true) { - - } else { + if (!noStorage == true) { md_elocalStorage(_editorName, `MDEditor__${_id}`, _id); } @@ -216,11 +202,11 @@ export default class TPMMDEditor extends Component { // this.answers_editormd.setValue(this.props.initValue) // } } - + // react_mdEditor_ componentDidMount = () => { - const { mdID, initValue, placeholder, showNullButton} = this.props; - + const { mdID, initValue, placeholder, showNullButton } = this.props; + let _id = `mdEditor_${mdID}` this.contentChanged = false; const _placeholder = placeholder || ""; @@ -235,7 +221,7 @@ export default class TPMMDEditor extends Component { const __editorName = _editorName; react_id = `react_${__editorName.id}`; const that = window[react_id] - + // 一个延迟的recreate或resize，不加这段代码，md初始化可能会出现样式问题 setTimeout(() => { if (that.props.needRecreate == true) { @@ -256,33 +242,33 @@ export default class TPMMDEditor extends Component { __editorName.setValue(that.state.initValue) } } - + __editorName.cm.on("change", (_cm, changeObj) => { that.contentChanged = true; if (that.state.showError) { - that.setState({showError: false}) + that.setState({ showError: false }) } that.onEditorChange() }) that.props.onCMBlur && __editorName.cm.on('blur', () => { that.props.onCMBlur() }) - that.props.onCMBeforeChange && __editorName.cm.on('beforeChange', (cm,change) => { - that.props.onCMBeforeChange(cm,change) + that.props.onCMBeforeChange && __editorName.cm.on('beforeChange', (cm, change) => { + that.props.onCMBeforeChange(cm, change) }) that.answers_editormd = __editorName; // 这里应该可以去掉了，方便调试加的 - window[__editorName.id+'_'] = __editorName; - }, initValue, this.onEditorChange,this.props.watch, { + window[__editorName.id + '_'] = __editorName; + }, initValue, this.onEditorChange, this.props.watch, { noStorage: this.props.noStorage, showNullButton: this.props.showNullButton, emoji: this.props.emoji }, this); - + } // 用在form里时，validate失败时出现一个红色边框 showError = () => { - this.setState({showError: true}) + this.setState({ showError: true }) } onEditorChange = () => { if (!this.answers_editormd) return; @@ -290,7 +276,7 @@ export default class TPMMDEditor extends Component { //console.log('onEditorChange', this.props.id, val) try { this.props.onChange && this.props.onChange(val) - } catch(e) { + } catch (e) { // http://localhost:3007/courses/1309/common_homeworks/6566/setting // 从这个页面，跳转到编辑页面，再在编辑页面点击返回的时候，这里会报错 console.error('出错') @@ -322,7 +308,7 @@ export default class TPMMDEditor extends Component { this.setState({ initValue: val }) } } - + render() { let { @@ -335,10 +321,10 @@ export default class TPMMDEditor extends Component { } return ( -
- {/* padding10-20 */} -
- +
+ {/* padding10-20 */} +
+
diff --git a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js index a8ab9cd3a..71f2cce90 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js +++ b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js @@ -208,7 +208,7 @@ render() {
- 方向： + 方向：
  • 全部