+
- <%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %>
+ <%= link_to image_tag(url_to_avatar(User.find(ma.user_id)), :width => "30", :height => "30"), user_path(User.find(ma.user_id)), :target => '_blank' %>
+
- 系统提示
+
+ <%=link_to User.find(ma.user_id).show_name, user_path(User.find(ma.user_id)),
+ :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+
- 班级申请进度反馈：
+ 申请以“<%= ma.content.include?('9') ? '教师' : '教辅' %>”身份加入：
+
- <%= link_to ma.status == 1 ?
- '您申请成为班级"'+Course.find(ma.course_id).name+'"的'+(ma.content.include?('9') ? '教师' : '教辅')+'申请已通过'
- :
- '您申请成为班级"'+Course.find(ma.course_id).name+'"的'+(ma.content.include?('9') ? '教师' : '教辅')+'的申请被拒绝', course_path(Course.find(ma.course_id)),
+ <%= link_to Course.find(ma.course_id).name, course_path(Course.find(ma.course_id)),
:class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-
-
- <%= User.current.lastname + User.current.firstname %>老师您好！您已成功加入班级<%= Course.find(ma.course_id).name%>。
-
-
申请班级：<%= Course.find(ma.course_id).name%>
-
班级描述：
-
<%= Course.find(ma.course_id).description.nil? ? "" : Course.find(ma.course_id).description.html_safe %>
-
申请职位：<%= ma.content == '9' ? "教师" : "教辅"%>
-
+
+ <% if ma.status == 1 %>
+ <%= User.find(ma.course_message_id).show_name%>已通过
+ <% else %>
+ <%= User.find(ma.course_message_id).show_name%>已拒绝
+ <% end %>
+
<%= time_tag(ma.created_at).html_safe %>
<% end %>
diff --git a/app/views/users/_user_receive_issues_list.html.erb b/app/views/users/_user_receive_issues_list.html.erb
new file mode 100644
index 000000000..b6181668c
--- /dev/null
+++ b/app/views/users/_user_receive_issues_list.html.erb
@@ -0,0 +1,24 @@
+<% issue_list(issues) do |issue| -%>
+
+ <%= render :partial => 'users/my_receive_issue_list', :locals => {:activity => issue, :user_activity_id => issue.id} %>
+<% end %>
+
+
+
+
+ <%= link_to "导出EXCEL", user_manage_issues_user_path(:format => 'xls'), :class => "hw_btn_blue ml10 mt10 mb10", :id => "sendexcel",
+ :onclick => "remote_function_export('#{User.current}')"%>
+
+
+
+
+
diff --git a/app/views/users/user_issues.html.erb b/app/views/users/user_issues.html.erb
index c23ff7378..c506ca856 100644
--- a/app/views/users/user_issues.html.erb
+++ b/app/views/users/user_issues.html.erb
@@ -173,13 +173,13 @@
}
$(function(){
<% if @type %>
- <% if @type == "assigned" %>
- HoverLi(2);
- switch_assign_to(<%= User.current.id %>);
- <% else %>
- HoverLi(3);
- createByMe(<%= User.current.id %>);
- <% end %>
+ <% if @type == "assigned" %>
+ HoverLi(2);
+ switch_assign_to(<%= User.current.id %>);
+ <% else %>
+ HoverLi(3);
+ createByMe(<%= User.current.id %>);
+ <% end %>
<% end %>
});
@@ -224,9 +224,9 @@
- 我的发布
- <%= @issues_author_count %>
-
+ 我的发布
+ <%= @issues_author_count %>
+
diff --git a/app/views/users/user_manage_homeworks.html.erb b/app/views/users/user_manage_homeworks.html.erb
new file mode 100644
index 000000000..83bd70ab6
--- /dev/null
+++ b/app/views/users/user_manage_homeworks.html.erb
@@ -0,0 +1,42 @@
+
+
+
+
+
+ <%= render :partial=>'my_homeworks_search', :locals => {:type => @type,:property => nil, :order => @order, :search => ''} %>
+
+
+
+ <%= render :partial => "manage_homework_list", :locals => {:homeworks => @homeworks, :is_manage => 1} %>
+
+
+
+
+
+ <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/users/user_manage_homeworks.js.erb b/app/views/users/user_manage_homeworks.js.erb
new file mode 100644
index 000000000..1ddc4687d
--- /dev/null
+++ b/app/views/users/user_manage_homeworks.js.erb
@@ -0,0 +1,7 @@
+$("#my_homework_list").html('<%= escape_javascript(render :partial => "manage_homework_list", :locals => {:homeworks => @homeworks, :is_manage => 1})%>');
+$("#homework_list_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>');
+$("#my_homework_sort").html('<%= escape_javascript( render :partial => 'users/my_homework_sort', :locals => {:type => @type,:property => @property,:order => @order,:search => @search})%>');
+$("#homework_type_all").attr('href','<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 0) %>');
+$("#homework_type_nor").attr('href','<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 1) %>');
+$("#homework_type_pro").attr('href','<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 2) %>');
+$("#homework_type_gro").attr('href','<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 3) %>');
\ No newline at end of file
diff --git a/app/views/users/user_manage_issues.html.erb b/app/views/users/user_manage_issues.html.erb
new file mode 100644
index 000000000..6a69800e1
--- /dev/null
+++ b/app/views/users/user_manage_issues.html.erb
@@ -0,0 +1,312 @@
+<%= content_for(:header_tags) do %>
+ <%= import_ke(enable_at: true,init_activity: true) %>
+<% end %>
+
+
+
+
+
+
+
我发布的Issue
+
+
+ <%= form_tag( user_manage_issues_user_path(@user), :remote => 'xls', :method => "post", :id => "issue_query_form", :class => 'query_form') do %>
+
+
+
+
+ -
+ 搜索结果
+ <%= render :partial => "users/my_issue_filter_all" %>
+
+
+
+
+
+ <%= select( :project, :project_id, options_for_issue_project_list(@issues_filter),
+ { :include_blank => false,:selected => @project_id ? @project_id : 0 },
+ { :onchange => "remote_function();add_style();", :id => "project_id", :name => "project_id", :class => "fl", :style=>"width: 80px; margin-right:20px;"}
+ )%>
+
+
+ <%= select( :issue, :user_id, [[@user.show_name, @user.id]].unshift(["指派给",0]),
+ { :include_blank => false, :selected => @assigned_to ? @assigned_to : 0},
+ {:onchange=>"remote_function();add_style();",:id => "assigned_to_id",:name => "assigned_to_id", :class => "fl", :style => "visibility:hidden; width:0px;margin:0px;padding:0px;"} )
+ %>
+
+
+
+
+
+
+
+
+ <% end %>
+ <% if @issues.empty? %>
+
<%= l(:label_no_data) %>
+ <% else %>
+
+ <%= render :partial => 'users/user_manage_issue_list', :locals => {:issues => @issues, :issue_pages => @issue_pages, :issue_count => @issue_count, :subject => @subject } %>
+
+ <% end %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/users/user_manage_issues.js.erb b/app/views/users/user_manage_issues.js.erb
new file mode 100644
index 000000000..7a24c05f4
--- /dev/null
+++ b/app/views/users/user_manage_issues.js.erb
@@ -0,0 +1,3 @@
+$("#issue_filter_all").html("<%= escape_javascript(render :partial => 'users/my_issue_filter_all') %>");
+$("#issue_list").html("<%= escape_javascript(render :partial => 'users/user_manage_issue_list',:locals => {:issues => @issues, :issue_pages=> @issue_pages, :issue_count => @issue_count })%>");
+$("#issue_list_pagination").html('<%= pagination_links_full @issue_pages, @issue_count, :issues => @issues, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>');
\ No newline at end of file
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index ddf686b6a..81e2fe399 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -14,16 +14,18 @@
-
<%= link_to image_tag(url_to_avatar(User.current),:class=>"fl mr10", :width => "50", :height => "50"), :alt => "用户头像" %>
-
- <%= form_for('new_form',:url => leave_user_message_path(@user.id), :html =>{:id => "user_feedback_new"}, :method => "post") do |f|%>
- <%=render :partial => "jour_form", :locals => {:f => f} %>
-
-
留言
-
私信
- <% end %>
-
-
+ <% unless is_current_user %>
+
<%= link_to image_tag(url_to_avatar(User.current),:class=>"fl mr10", :width => "50", :height => "50"), :alt => "用户头像" %>
+
+ <%= form_for('new_form',:url => leave_user_message_path(@user.id), :html =>{:id => "user_feedback_new"}, :method => "post") do |f|%>
+ <%= render :partial => "jour_form", :locals => {:f => f} %>
+
+
留言
+
私信
+ <% end %>
+
+
+ <% end %>
<%=render :partial => "users/user_jours_list", :locals => {:jours =>@jour, :page => 0, :type => @type, :count => @jour_count} %>
diff --git a/app/views/users/user_receive_homeworks.html.erb b/app/views/users/user_receive_homeworks.html.erb
new file mode 100644
index 000000000..58a79ba5c
--- /dev/null
+++ b/app/views/users/user_receive_homeworks.html.erb
@@ -0,0 +1,42 @@
+
+
+
+
+
+ <%= render :partial=>'my_homeworks_search', :locals => {:type => @type,:property => nil, :order => @order, :search => ''} %>
+
+
+
+ <%= render :partial => "receive_homework_list", :locals => {:homeworks => @homeworks} %>
+
+
+
+
+
+ <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/users/user_receive_homeworks.js.erb b/app/views/users/user_receive_homeworks.js.erb
new file mode 100644
index 000000000..3ffbfaaa3
--- /dev/null
+++ b/app/views/users/user_receive_homeworks.js.erb
@@ -0,0 +1,7 @@
+$("#my_homework_list").html('<%= escape_javascript(render :partial => "receive_homework_list", :locals => {:homeworks => @homeworks})%>');
+$("#homework_list_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>');
+$("#my_homework_sort").html('<%= escape_javascript( render :partial => 'users/my_homework_sort', :locals => {:type => @type,:property => @property,:order => @order,:search => @search})%>');
+$("#homework_type_all").attr('href','<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 0) %>');
+$("#homework_type_nor").attr('href','<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 1) %>');
+$("#homework_type_pro").attr('href','<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 2) %>');
+$("#homework_type_gro").attr('href','<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 3) %>');
\ No newline at end of file
diff --git a/app/views/users/user_receive_issues.html.erb b/app/views/users/user_receive_issues.html.erb
new file mode 100644
index 000000000..883b77688
--- /dev/null
+++ b/app/views/users/user_receive_issues.html.erb
@@ -0,0 +1,313 @@
+<%= content_for(:header_tags) do %>
+ <%= import_ke(enable_at: true,init_activity: true) %>
+<% end %>
+
+
+
+
+
+
+
我收到的Issue
+
+
+ <%= form_tag( user_receive_issues_user_path(@user), :remote => 'xls', :method => "post", :id => "issue_query_form", :class => 'query_form') do %>
+
+
+
+
+ -
+ 搜索结果
+ <%= render :partial => "users/my_issue_filter_all" %>
+
+
+
+
+
+ <%= select( :project, :project_id, options_for_issue_project_list(@issues_filter),
+ { :include_blank => false,:selected => @project_id ? @project_id : 0 },
+ { :onchange => "remote_function();add_style();", :id => "project_id", :name => "project_id", :class => "fl", :style=>"width: 80px; margin-right:20px;"}
+ )%>
+
+ <%= select( :issue, :user_id, [[@user.show_name, @user.id]].unshift(["发布人",0]),
+ {:include_blank => false,:selected => @author_id ? @author_id : 0},
+ {:onchange => "remote_function();add_style();",:id => "author_id", :name => "author_id", :class => "fl", :style => "visibility:hidden;width: 0px;margin:0px;padding:0px;"}
+ )
+ %>
+
+
+
+
+
+
+
+
+
+ <% end %>
+ <% if @issues.empty? %>
+
<%= l(:label_no_data) %>
+ <% else %>
+
+ <%= render :partial => 'users/user_receive_issues_list', :locals => {:issues => @issues, :issue_pages => @issue_pages, :issue_count => @issue_count, :subject => @subject } %>
+
+ <% end %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/users/user_receive_issues.js.erb b/app/views/users/user_receive_issues.js.erb
new file mode 100644
index 000000000..41f8ac63c
--- /dev/null
+++ b/app/views/users/user_receive_issues.js.erb
@@ -0,0 +1,3 @@
+$("#issue_filter_all").html("<%= escape_javascript(render :partial => 'users/my_issue_filter_all') %>");
+$("#issue_list").html("<%= escape_javascript(render :partial => 'users/user_receive_issues_list',:locals => {:issues => @issues, :issue_pages=> @issue_pages, :issue_count => @issue_count })%>");
+$("#issue_list_pagination").html('<%= pagination_links_full @issue_pages, @issue_count, :issues => @issues, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>');
\ No newline at end of file
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index a670b6497..c153ba334 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -291,7 +291,7 @@ zh:
label_tags_project_name: "项目名称："
label_projects_new_name: "项目名称"
- label_tags_project_description: "项目描述"
+ label_tags_project_description: "项目简介"
label_organization_name: "组织名称"
label_organization_description: "组织描述"
diff --git a/config/routes.rb b/config/routes.rb
index 3453a5258..cb1218965 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -732,6 +732,10 @@ RedmineApp::Application.routes.draw do
get 'edit_brief_introduction'
get "user_resource"
match "user_issues", :to => 'users#user_issues', :via => [:get, :post], :as => "user_issues"
+ match "user_manage_issues", :to => 'users#user_manage_issues', :via => [:get, :post], :as => "user_manage_issues"
+ match "user_receive_issues", :to => 'users#user_receive_issues', :via => [:get, :post], :as => "user_receive_issues"
+ match "user_manage_homeworks", :to => 'users#user_manage_homeworks', :via => [:get, :post], :as => "user_manage_homeworks"
+ match "user_receive_homeworks", :to =>'users#user_receive_homeworks', :via => [:get, :post], :as => "user_receive_homeworks"
get "import_resources"
get "import_resources_search"
post "import_into_container"
diff --git a/db/schema.rb b/db/schema.rb
index 4929caadb..697f7588f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,8 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20161230061940) do
-
+ActiveRecord::Schema.define(:version => 20161223083022) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
t.string "act_type", :null => false
@@ -2434,16 +2433,6 @@ ActiveRecord::Schema.define(:version => 20161230061940) do
t.datetime "updated_at", :null => false
end
- create_table "wechat_logs", :force => true do |t|
- t.string "openid", :null => false
- t.text "request_raw"
- t.text "response_raw"
- t.text "session_raw"
- t.datetime "created_at", :null => false
- end
-
- add_index "wechat_logs", ["openid"], :name => "index_wechat_logs_on_openid"
-
create_table "wiki_content_versions", :force => true do |t|
t.integer "wiki_content_id", :null => false
t.integer "page_id", :null => false
diff --git a/lib/tasks/zip.rake b/lib/tasks/zip.rake
new file mode 100644
index 000000000..ca5707989
--- /dev/null
+++ b/lib/tasks/zip.rake
@@ -0,0 +1,18 @@
+#coding=utf-8
+
+namespace :zip do
+ desc "手工打包作品"
+ task :pack => :environment do
+ include ZipService
+ include Redmine::I18n
+ homework = Object.const_get(ENV['CLASS']).find ENV["ID"]
+ file_count = 0
+ homework.student_works.map { |work| file_count += work.attachments.count}
+ if file_count > 0
+ zipfile = zip_homework_common homework
+ else
+ zipfile = {:message => "no file"}
+ end
+ puts "out: #{zipfile}"
+ end
+end
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index e5b61cc52..9b378c72c 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -126,7 +126,7 @@
-
+
@@ -140,11 +140,17 @@
-
-
选择您要@的人
-
+
+
+
选择您要@的人
+
+
+
+ {{person.name}}
（{{person.login}}）
{{person.name}}
（{{person.login}}）
{{person.name}}
（{{person.login}}）
{{person.name}}
（{{person.login}}）
{{person.name}}
（{{person.login}}）
-
- {{person.name}}
（{{person.login}}）
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 0313687af..ba9d205ce 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -942,6 +942,14 @@ $(function(){
$('a.tb_all').bind('ajax:complete', function (event, data, status, xhr) {
if(status == 'success'){
var res = JSON.parse(data.responseText);
+ if(res.err == -1){
+ var htmlvalue = '';
+ pop_box_new(htmlvalue,380,166);
+ return;
+ }
+
if(res.length<1){
return;
}
@@ -974,7 +982,7 @@ $(function(){
});
$('#download_homework_attachments').bind('ajax:complete', function (event, data, status, xhr) {
if(status == 'success'){
- var res = JSON.parse(data.responseText);
+ var res = JSON.parse(data.responseText);
if(res.length == null){
alert("该作业没有任何附件可下载");
}
diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css
index c57424f9f..7aa5dba04 100644
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@@ -248,6 +248,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
.w56 {width:56px;}
.w60{ width:60px;}
.w61{ width:61px;}
+.w65{ width:65px;}
.w70{ width:70px;}
.w80{ width:80px;}
.w90{ width:90px;}
@@ -878,6 +879,9 @@ input.btn-blue{background: #3b94d6; color: #fff; cursor:pointer;}
input:hover.btn-blue{background: #2788d0; color: #fff;}
input.btn-grey{background: #d9d9d9; color: #656565; cursor:default;}
input.btn-grey:hover{background: #717171; color: #fff; cursor:default;}
+.icons-user-homework{background:url(/images/user/home-user-left.png) 0px -150px no-repeat; }
+.homework-user-leftnav-li{ height: 25px; line-height: 40px; padding-left: 25px; color: #666;background:url(/images/user/home-user-left.png) 0px -149px no-repeat; font-size: 14px; position: relative; }
+.homework-user-leftnav-li:hover{ height: 25px; line-height: 40px; padding-left: 25px; background:#f4f4f4; background:url(/images/user/home-user-left.png) 0px -186px no-repeat; font-size: 14px; position: relative; }
.separator_short{margin-top: 5px; margin-bottom: 5px; margin-left: 37px; width: 433px; display: block; border-bottom: 1px solid #d9d9d9;}
.separator_long{margin-top: 5px; margin-bottom: 5px; margin-left: 37px; width: 522px; display: block; border-bottom: 1px solid #d9d9d9;}
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index d8c272b93..0c6a2cbb6 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -283,7 +283,9 @@ a.underline {text-decoration:underline;}
.weixin-users-all li:hover{ background:#f4f4f4;}
/*弹出@选择对话框 guange*/
-.wechat-at {position: absolute; z-index: 999; top: 0; left:0; width: 100%; height: 100%; background-color: #ffffff;}
-
+.wechat-at {position: fixed; z-index: 999; top: 0; left:0; width: 100%; height: 100%; background-color: #ffffff;}
+.wechat-at-inner{overflow-y: scroll;
+ -webkit-overflow-scrolling: touch;
+ height: 100%;}
/*@页面的取消按钮*/
-.cancel-btn-new {position: absolute; font-size: 13px; height: 24px; line-height: 24px; vertical-align: middle; padding: 0 7px; color: #888; background-color: #fff; outline: none; border: none; top: 11px; right: 10px;}
+.cancel-btn-new {font-size: 13px; height: 24px; line-height: 24px; padding: 0 7px; color: #888; background-color: #fff; outline: none; border: none; margin-top: 11px; margin-right: 10px;}