[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11169] more on controller
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11169] more on controller |
|
Date: |
Wed, 12 Jun 2013 19:25:58 +0000 |
Revision: 11169
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11169
Author: sigurdne
Date: 2013-06-12 19:25:58 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
more on controller
Modified Paths:
--------------
trunk/controller/inc/class.uicase.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/js/controller/check_list.js
Added Paths:
-----------
trunk/controller/js/controller/check_list_update_status.js
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2013-06-12 13:57:05 UTC (rev
11168)
+++ trunk/controller/inc/class.uicase.inc.php 2013-06-12 19:25:58 UTC (rev
11169)
@@ -805,6 +805,7 @@
phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'controller',
'case.js');
+ self::add_javascript('controller', 'controller',
'check_list_update_status.js');
self::render_template_xsl(
array('check_list/fragments/check_list_menu', 'case/cases_tab_menu',
'case/view_open_cases', 'case/case_row',
'check_list/fragments/nav_control_plan',
'check_list/fragments/check_list_top_section',
@@ -887,6 +888,7 @@
phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'controller',
'case.js');
+ self::add_javascript('controller', 'controller',
'check_list_update_status.js');
self::render_template_xsl(
array('check_list/fragments/check_list_menu', 'case/cases_tab_menu',
'case/view_closed_cases', 'case/case_row',
'check_list/fragments/nav_control_plan',
'check_list/fragments/check_list_top_section',
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2013-06-12 13:57:05 UTC
(rev 11168)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2013-06-12 19:25:58 UTC
(rev 11169)
@@ -426,6 +426,7 @@
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
self::add_javascript('controller', 'controller',
'check_list.js');
+ self::add_javascript('controller', 'controller',
'check_list_update_status.js');
self::render_template_xsl(array('check_list/fragments/check_list_menu',
'check_list/fragments/nav_control_plan',
'check_list/fragments/check_list_top_section',
'check_list/edit_check_list',
@@ -589,6 +590,7 @@
);
phpgwapi_jquery::load_widget('core');
+ self::add_javascript('controller', 'controller',
'check_list_update_status.js');
self::render_template_xsl(array('check_list/fragments/check_list_menu',
'check_list/fragments/check_list_top_section',
'check_list/fragments/nav_control_plan',
'check_list/view_control_info',
Modified: trunk/controller/js/controller/check_list.js
===================================================================
--- trunk/controller/js/controller/check_list.js 2013-06-12 13:57:05 UTC
(rev 11168)
+++ trunk/controller/js/controller/check_list.js 2013-06-12 19:25:58 UTC
(rev 11169)
@@ -71,46 +71,4 @@
}
}
});
-
- // UPDATE CHECKLIST STATUS
- $("#update-check-list-status").live("submit", function(e){
- e.preventDefault();
-
- var thisForm = $(this);
-
- var statusClass = $(thisForm).attr("class");
-
- var requestUrl = $(thisForm).attr("action");
-
- var submitBnt = $(thisForm).find("input[type='submit']");
-
- $.ajax({
- type: 'POST',
- url: requestUrl + "&" + $(thisForm).serialize(),
- success: function(data) {
- if(data){
- var jsonObj = jQuery.parseJSON(data);
-
- if(jsonObj.status == 'not_saved')
- {
- $(submitBnt).val("feil ved
lagring");
- }
- else if(jsonObj.status == '1')
- {
- $(submitBnt).val("Utført");
-
$("#update-check-list-status-value").val(0);
- //
$("#update-check-list-status-icon.not_done").hide();
- //
$("#update-check-list-status-icon-done.done").show();
- }
- else
- {
- $(submitBnt).val("Ikke utført");
-
$("#update-check-list-status-value").val(1);
- //
$("#update-check-list-status-icon.not_done").show();
- //
$("#update-check-list-status-icon-done.done").hide();
- }
- }
- }
- });
- });
});
Added: trunk/controller/js/controller/check_list_update_status.js
===================================================================
--- trunk/controller/js/controller/check_list_update_status.js
(rev 0)
+++ trunk/controller/js/controller/check_list_update_status.js 2013-06-12
19:25:58 UTC (rev 11169)
@@ -0,0 +1,44 @@
+$(document).ready(function(){
+
+ // UPDATE CHECKLIST STATUS
+ $("#update-check-list-status").live("submit", function(e){
+ e.preventDefault();
+
+ var thisForm = $(this);
+
+ var statusClass = $(thisForm).attr("class");
+
+ var requestUrl = $(thisForm).attr("action");
+
+ var submitBnt = $(thisForm).find("input[type='submit']");
+
+ $.ajax({
+ type: 'POST',
+ url: requestUrl + "&" + $(thisForm).serialize(),
+ success: function(data) {
+ if(data){
+ var jsonObj = jQuery.parseJSON(data);
+
+ if(jsonObj.status == 'not_saved')
+ {
+ $(submitBnt).val("feil ved
lagring");
+ }
+ else if(jsonObj.status == '1')
+ {
+ $(submitBnt).val("Utført");
+
$("#update-check-list-status-value").val(0);
+ //
$("#update-check-list-status-icon.not_done").hide();
+ //
$("#update-check-list-status-icon-done.done").show();
+ }
+ else
+ {
+ $(submitBnt).val("Ikke utført");
+
$("#update-check-list-status-value").val(1);
+ //
$("#update-check-list-status-icon.not_done").show();
+ //
$("#update-check-list-status-icon-done.done").hide();
+ }
+ }
+ }
+ });
+ });
+});
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11169] more on controller,
Sigurd Nes <=