added option to confirm proposals evaluation

Ábner Silva de Oliveira
1 parent fd453c35
Showing 4 changed files with 85 additions and 18 deletions Show diff stats
controllers/myprofile/proposals_discussion_plugin_evaluate_tasks_controller.rb
public/style.css
views/tasks/_task.html.erb
views/tasks/index.html.erb
@@ -20,7 +20,7 @@ class ProposalsDiscussionPluginEvaluateTasksController &lt; MyProfileController
     render json: result
   end
-  def flag_reject_proposal
+  def flag_reprove_proposal
     if request.post? && params[:task_id]
       result = {
         success: false,
@@ -320,26 +320,31 @@ form .proposals-discussion-plugin .body textarea {
   color: gray;
 }
-.evaluation_bar {
-  width: 400px;
-}
 .evaluation_button {
   cursor: pointer;
+  width: auto;
+  float: left;
+  padding: 5px;
 }
 .evaluation_button img {
   float:left;
   width: 32px;
   height:32px;
-  margin-left: 30px;
+  margin-left: 10px;
+  margin-right: 10px;
 }
 .evaluation_button span {
-  margin-left: 8px;
+  margin-right: 10px;
   font-size: 24px;
-  width: auto;
   float:left;
+
+}
+
+div.evaluation_button.checked {
+  border: 1px dotted black;
 }
 .evaluation_button.approval span {
@@ -349,3 +354,30 @@ form .proposals-discussion-plugin .body textarea {
 .evaluation_button.reproval span {
   color: red;
 }
+
+.evaluation_toolbar {
+  float: right;
+}
+
+.confirm_evaluation_toolbar {
+  clear: both;
+  width: 100%;
+  text-align:center;
+  font-size: 24px;
+}
+
+div.confirm_evaluation_button a {
+  text-decoration: none;
+  color: #003366;
+}
+
+div.confirm_evaluation_button a:hover {
+  text-decoration: underline;
+}
+
+
+div.confirm_evaluation_button a.disabled {
+  text-decoration: none;
+  color: gray;
+  display: hidden;
+}
 <div class="task_box" id="task-<%= task.id %>">
-
+  <%= tag :a, name: "task-#{task.id}" %>
   <%= render :partial => 'task_icon', :locals => {:task => task} %>
   <% if !@view_only && profile.organization? && @responsible_candidates.present? %>
@@ -64,17 +64,17 @@
     <% end %>
     <% if @view_only %>
-      <div class="evaluation_bar" style="float:right">
+      <div class="evaluation_toolbar">
         <div class="evaluation_button approval"
           data-url='<%="/myprofile/#{profile.identifier}/plugin/proposals_discussion/evaluate_tasks/flag_approve_proposal"%>'
           data-task-id="<%= task.id %>"
-          data-status-id="<%= ProposalsDiscussionPlugin::ProposalTask::Status::FLAGGED_FOR_APPROVAL  %>">
+          data-flag-action="flag_approve_proposal">
           <img class="" src="/plugins/proposals_discussion/images/approval.png">
           <span>Aprovar</span>
         </div>
-        <div class="evaluation_button reproval"
+        <div id="evaluation_button_#{task.id}" class="evaluation_button reproval"
           data-url='<%="/myprofile/#{profile.identifier}/plugin/proposals_discussion/evaluate_tasks/flag_reject_proposal"%>'
-          data-task-id="<%= task.id %>" data-status-id="<%= ProposalsDiscussionPlugin::ProposalTask::Status::FLAGGED_FOR_REPROVAL %>">
+          data-task-id="<%= task.id %>" data-flag-action="flag_reprove_proposal">
           <img class="" src="/plugins/proposals_discussion/images/reproval.png">
           <span>Reprovar</span>
         </div>
@@ -98,7 +98,12 @@
         </div>
       </div>
-
+      <div class="confirm_evaluation_toolbar">
+        <div class="confirm_evaluation_button">
+          <a data-task-id="<%= task.id %>" class="disabled" href="#task-<%= task.id %>"
+            data-href='<%="/myprofile/#{profile.identifier}/plugin/proposals_discussion/evaluate_tasks/"%>'>Confirmar</span>
+        </div>
+      </div>
   <% end %>
@@ -107,18 +107,48 @@
   })
   $('div.evaluation_button').on('click', null, function(){
+    toggleEvaluation(this);
+  });
+
+
+  $('div.confirm_evaluation_button a').on('click', null, function(){
     evaluate_task(this);
   });
+  function toggleEvaluation(el){
+    var task_id = $(el).data('task-id');
+    var taskElement = $('#task-' + task_id);
+    //var status_id = $(el).data('status-id')
+    //taskElement.data('status_evaluated', status_id);
+
+    taskElement.find('div.evaluation_button').removeClass('checked');
+
+    taskElement.find('div.confirm_evaluation_button a').removeClass('disabled');
+
+    $(el).addClass("checked");
+  }
+
   function evaluate_task(el) {
-    var url = $(el).data('url');
+
+    if($(el).hasClass('disabled')) {
+      return false;
+    }
+
+    var url = $(el).data('href');
+
     var task_id = $(el).data('task-id');
+
+    var taskElement = $('#task-' + task_id);
+
+    var checkedButton = taskElement.find("div.evaluation_button.checked");
+
+    var flag_action = checkedButton.data('flag-action');
+
     var params = {
-      task_id: task_id,
-      flagged_status: $(el).data('status-id')
+      task_id: task_id
     };
-    var taskElement = $('#task-' + task_id);
-    jQuery.post(url , params  ,
+
+    jQuery.post(url + "/" + flag_action, params  ,
       function(data) {
         if (data.success) {
           $(el).effect("highlight");
	@@ -20,7 +20,7 @@ class ProposalsDiscussionPluginEvaluateTasksController < MyProfileController		@@ -20,7 +20,7 @@ class ProposalsDiscussionPluginEvaluateTasksController < MyProfileController
20	render json: result	20	render json: result
21	end	21	end
22		22
23	- def flag_reject_proposal	23	+ def flag_reprove_proposal
24	if request.post? && params[:task_id]	24	if request.post? && params[:task_id]
25	result = {	25	result = {
26	success: false,	26	success: false,
	@@ -320,26 +320,31 @@ form .proposals-discussion-plugin .body textarea {		@@ -320,26 +320,31 @@ form .proposals-discussion-plugin .body textarea {
320	color: gray;	320	color: gray;
321	}	321	}
322		322
323	-.evaluation_bar {
324	- width: 400px;
325	-}
326		323
327	.evaluation_button {	324	.evaluation_button {
328	cursor: pointer;	325	cursor: pointer;
		326	+ width: auto;
		327	+ float: left;
		328	+ padding: 5px;
329	}	329	}
330		330
331	.evaluation_button img {	331	.evaluation_button img {
332	float:left;	332	float:left;
333	width: 32px;	333	width: 32px;
334	height:32px;	334	height:32px;
335	- margin-left: 30px;	335	+ margin-left: 10px;
		336	+ margin-right: 10px;
336	}	337	}
337		338
338	.evaluation_button span {	339	.evaluation_button span {
339	- margin-left: 8px;	340	+ margin-right: 10px;
340	font-size: 24px;	341	font-size: 24px;
341	- width: auto;
342	float:left;	342	float:left;
		343	+
		344	+}
		345	+
		346	+div.evaluation_button.checked {
		347	+ border: 1px dotted black;
343	}	348	}
344		349
345	.evaluation_button.approval span {	350	.evaluation_button.approval span {
	@@ -349,3 +354,30 @@ form .proposals-discussion-plugin .body textarea {		@@ -349,3 +354,30 @@ form .proposals-discussion-plugin .body textarea {
349	.evaluation_button.reproval span {	354	.evaluation_button.reproval span {
350	color: red;	355	color: red;
351	}	356	}
		357	+
		358	+.evaluation_toolbar {
		359	+ float: right;
		360	+}
		361	+
		362	+.confirm_evaluation_toolbar {
		363	+ clear: both;
		364	+ width: 100%;
		365	+ text-align:center;
		366	+ font-size: 24px;
		367	+}
		368	+
		369	+div.confirm_evaluation_button a {
		370	+ text-decoration: none;
		371	+ color: #003366;
		372	+}
		373	+
		374	+div.confirm_evaluation_button a:hover {
		375	+ text-decoration: underline;
		376	+}
		377	+
		378	+
		379	+div.confirm_evaluation_button a.disabled {
		380	+ text-decoration: none;
		381	+ color: gray;
		382	+ display: hidden;
		383	+}
	@@ -107,18 +107,48 @@		@@ -107,18 +107,48 @@
107	})	107	})
108		108
109	$('div.evaluation_button').on('click', null, function(){	109	$('div.evaluation_button').on('click', null, function(){
		110	+ toggleEvaluation(this);
		111	+ });
		112	+
		113	+
		114	+ $('div.confirm_evaluation_button a').on('click', null, function(){
110	evaluate_task(this);	115	evaluate_task(this);
111	});	116	});
112		117
		118	+ function toggleEvaluation(el){
		119	+ var task_id = $(el).data('task-id');
		120	+ var taskElement = $('#task-' + task_id);
		121	+ //var status_id = $(el).data('status-id')
		122	+ //taskElement.data('status_evaluated', status_id);
		123	+
		124	+ taskElement.find('div.evaluation_button').removeClass('checked');
		125	+
		126	+ taskElement.find('div.confirm_evaluation_button a').removeClass('disabled');
		127	+
		128	+ $(el).addClass("checked");
		129	+ }
		130	+
113	function evaluate_task(el) {	131	function evaluate_task(el) {
114	- var url = $(el).data('url');	132	+
		133	+ if($(el).hasClass('disabled')) {
		134	+ return false;
		135	+ }
		136	+
		137	+ var url = $(el).data('href');
		138	+
115	var task_id = $(el).data('task-id');	139	var task_id = $(el).data('task-id');
		140	+
		141	+ var taskElement = $('#task-' + task_id);
		142	+
		143	+ var checkedButton = taskElement.find("div.evaluation_button.checked");
		144	+
		145	+ var flag_action = checkedButton.data('flag-action');
		146	+
116	var params = {	147	var params = {
117	- task_id: task_id,
118	- flagged_status: $(el).data('status-id')	148	+ task_id: task_id
119	};	149	};
120	- var taskElement = $('#task-' + task_id);
121	- jQuery.post(url , params ,	150	+
		151	+ jQuery.post(url + "/" + flag_action, params ,
122	function(data) {	152	function(data) {
123	if (data.success) {	153	if (data.success) {
124	$(el).effect("highlight");	154	$(el).effect("highlight");