Revisión 394
Añadido por Manu Mora Gordillo hace más de 12 años
| controlies/trunk/debian/changelog | ||
|---|---|---|
|
controlies (0.6.4-2) unstable; urgency=low
|
||
|
|
||
|
* Correcci?n de errores
|
||
|
|
||
|
-- Manuel Mora Gordillo <manuito@gmail.com> Wed, 26 Sep 2012 10:23:00 +0200
|
||
|
|
||
|
controlies (0.6.4-1) unstable; urgency=low
|
||
|
|
||
|
* Correcci?n de errores y activaci?n de la base de datos
|
||
| controlies/trunk/applications/controlies/modules/LaptopsHistory.py | ||
|---|---|---|
|
|
||
|
|
||
|
def delete(self):
|
||
|
self.DB(self.DB.laptops_history.id_historical==self.id_historical).delete()
|
||
|
self.DB(self.DB.laptops_historical.id_historical==self.id_historical).delete()
|
||
|
self.DB.commit()
|
||
|
return "OK"
|
||
|
|
||
| controlies/trunk/applications/controlies/modules/Laptops.py | ||
|---|---|---|
|
|
||
|
try:
|
||
|
if str(args['trademark']) != "None":
|
||
|
sql = sql+" AND t.trademark LIKE '%"+str(args['trademark'])+"%'"
|
||
|
sql = sql+" AND lt.trademark LIKE '%"+str(args['trademark'])+"%'"
|
||
|
except LookupError:
|
||
|
pass
|
||
|
|
||
|
try:
|
||
|
if str(args['model']) != "None":
|
||
|
sql = sql+" AND t.model LIKE '%"+str(args['model'])+"%'"
|
||
|
sql = sql+" AND lt.model LIKE '%"+str(args['model'])+"%'"
|
||
|
except LookupError:
|
||
|
pass
|
||
|
|
||
| controlies/trunk/applications/controlies/views/laptops_groups/index.html | ||
|---|---|---|
|
{name:"employeeNumber",index:"employeeNumber",width:150,align:"center"},
|
||
|
{name:"serial_number",index:"serial_number", editable:true, width:250,align:"center"}
|
||
|
],
|
||
|
rowNum:30,
|
||
|
rowNum:35,
|
||
|
pager: pager_id,
|
||
|
sortname: 'cn',
|
||
|
sortorder: "desc",
|
||
| controlies/trunk/applications/controlies/views/laptops/history.html | ||
|---|---|---|
|
$("#cancelButton")
|
||
|
.button({ icons: { primary: "ui-icon-close"}})
|
||
|
.click( function(){ $('#dialog-form').dialog('close'); });
|
||
|
|
||
|
jQuery("#dialog-form-history").html("");
|
||
|
});
|
||
|
|
||
|
function print_grid_historical(){
|
||
| ... | ... | |
|
function addRecordHistory(){
|
||
|
|
||
|
jQuery("#messageLoading").show();
|
||
|
|
||
|
jQuery("#dialog-form-history").html("");
|
||
|
jQuery("#dialog-form-history").html("").css("display","none");
|
||
|
jQuery("#dialog-form-history").load("form_history.html", function() {
|
||
|
getAllStates();
|
||
| ... | ... | |
|
}).dialog('option', 'position', [x, y]);
|
||
|
});
|
||
|
}
|
||
|
|
||
|
|
||
|
function modifyRecordHistory(){
|
||
|
var id;
|
||
|
|
||
| ... | ... | |
|
var id = rowSelectedHistory();
|
||
|
if(id==false)
|
||
|
return false;
|
||
|
|
||
|
|
||
|
jQuery("#dialog-form-history").html("").css("display","none");
|
||
|
jQuery("#dialog-form-history").load("form_history.html", function() {
|
||
|
getAllStates();
|
||
| ... | ... | |
|
jQuery.post("call/json/deleteHistory","id_historical="+id, function(data){
|
||
|
jQuery("#dialog-confirm").dialog( "close" );
|
||
|
jQuery("#list_history").trigger("reloadGrid");
|
||
|
jQuery("#list").trigger("reloadGrid");
|
||
|
});
|
||
|
},
|
||
|
"Cancelar": function() {
|
||
| controlies/trunk/applications/controlies/views/laptops/form_history.html | ||
|---|---|---|
|
});
|
||
|
|
||
|
function restartStyle(){
|
||
|
$("#form_data_history p span").css("color","black");
|
||
|
$('#messageHistory').html("");
|
||
|
jQuery("#form_data_history p span").css("color","black");
|
||
|
jQuery('#messageHistory').html("");
|
||
|
}
|
||
|
|
||
|
function sendHistory(){
|
||
| ... | ... | |
|
case "OK":{
|
||
|
jQuery('#messageHistory').html("Operación realizada correctamente").css("color","green").effect("highlight", {"color":"yellow"}, 1000);
|
||
|
jQuery("#list_history").trigger("reloadGrid");
|
||
|
jQuery("#list").trigger("reloadGrid");
|
||
|
setTimeout("$('#dialog-form-history').dialog('close')",1000);
|
||
|
jQuery("#list").trigger("reloadGrid");
|
||
|
setTimeout("jQuery('#dialog-form-history').dialog('close')",1000);
|
||
|
break;
|
||
|
}
|
||
|
case "fail":{
|
||
Exportar a: Unified diff
Correccion de errores