Proyecto

General

Perfil

« Anterior | Siguiente » 

Revisión 389

Añadido por Manu Mora Gordillo hace más de 12 años

Activación de la base de datos

Ver diferencias:

controlies/trunk/debian/changelog
controlies (0.6.4-1) unstable; urgency=low
* Correcci?n de errores y activaci?n de la base de datos
-- Manuel Mora Gordillo <manuito@gmail.com> Wed, 26 Sep 2012 10:23:00 +0200
controlies (0.6.3-5) unstable; urgency=low
* Cambio almacenamiento nombre y apellidos
controlies/trunk/applications/controlies/views/laptops/index.html
}
},
colNames:['Marca','Modelo','Número Serie','Login','Estado'],
colNames:['Marca','Modelo','Número Serie','Tipo','Login','Estado'],
colModel:[
{name:'trademark',index:'trademark', width:60, align:"center"},
{name:'model',index:'model', width:115, align:"center"},
{name:'serial_number',index:'serial_number', width:115, align:"center"},
{name:'user_type',index:'user_type', width:60, align:"center", stype:'select', editoptions:{value:":Todos;Profesor:Profesores;Alumno:Alumnos;Ninguno:Ninguno"}},
{name:'username',index:'username', width:115, align:"center"},
{name:'state',index:'state', width:115, align:"center"}
],
controlies/trunk/applications/controlies/controllers/laptops_groups.py
userData = getUserData(request.vars["username"])
max = l.getMaxId()
lh = LaptopsHistory(cdb,"",max,"2","2",userData["nif"],request.vars["username"],userData["name"],"Reasignado")
lh = LaptopsHistory(cdb,"",max,"2","2",userData["nif"],request.vars["username"],userData["name"],"")
id_laptop = lh.userAssignment()
if id_laptop:
controlies/trunk/applications/controlies/controllers/laptops.py
l = Laptops(cdb,request.vars["id_laptop"],serial,request.vars["id_trademark"])
response = l.process(request.vars["action"])
return dict(response = response)
@service.json
controlies/trunk/applications/controlies/modules/Laptops.py
##############################################################################
from math import floor
from applications.controlies.modules.LaptopsHistory import LaptopsHistory
class Laptops(object):
......
def list(self,args):
sql = "SELECT l.id_laptop, lt.trademark, lt.model, l.serial_number, lh.username, s.state"
sql = sql+" FROM laptops l"
sql = sql+" LEFT JOIN laptops_trademarks lt ON l.id_trademark=lt.id_trademark "
sql = sql+" LEFT JOIN laptops_historical lh ON l.id_laptop=lh.id_laptop "
sql = sql+" LEFT JOIN states s ON lh.id_state=s.id_state "
sql = "SELECT l.id_laptop, lt.trademark, lt.model, l.serial_number, ut.user_type, lh.username, s.state"
sql = sql+" FROM laptops l, laptops_historical lh"
sql = sql+" LEFT JOIN laptops_trademarks lt ON l.id_trademark=lt.id_trademark "
#sql = sql+" INNER JOIN laptops_historical lh ON l.id_laptop=lh.id_laptop"
sql = sql+" LEFT JOIN states s ON lh.id_state=s.id_state "
sql = sql+" LEFT JOIN users_types ut ON ut.id_user_type=lh.id_user_type "
sql = sql+" WHERE 1=1 "
sql = sql+" AND l.id_laptop=lh.id_laptop "
sql = sql+" AND lh.id_historical IN (SELECT MAX(lh2.id_historical) FROM laptops_historical lh2 WHERE lh2.id_laptop=l.id_laptop) "
try:
if str(args['serial_number']) != "None":
sql = sql+" AND l.serial_number LIKE '%"+str(args['serial_number'])+"%'"
......
pass
try:
if str(args['user_type']) != "None":
if str(args['user_type']) == "Ninguno":
sql = sql+" AND (lh.id_user_type='' OR lh.id_user_type='0')"
else:
sql = sql+" AND ut.user_type='"+str(args['user_type'])+"'"
except LookupError:
pass
try:
if str(args['username']) != "None":
sql = sql+" AND lh.username LIKE '%"+str(args['username'])+"%'"
except LookupError:
......
for reg in result:
row = {
"id":reg[0],
"cell":[reg[1],reg[2],reg[3],reg[4],reg[5]],
"cell":[reg[1],reg[2],reg[3],reg[4],reg[5],reg[6]],
"trademark":reg[1],
"model":reg[2],
"serial_number":reg[3],
"username":reg[4],
"state":reg[5]
"user_type":reg[4],
"username":reg[5],
"state":reg[6],
}
rows.append(row)
......
def add(self):
self.DB.laptops.insert(serial_number=self.serial_number,id_trademark=self.id_trademark)
max = self.getMaxId()
lh = LaptopsHistory(self.DB,"",max,"1","0","","","","Nuevo en el sistema")
lh.add()
return "OK"
controlies/trunk/applications/controlies/modules/LaptopsHistory.py
#result = self.DB.executesql(sql)
id_laptop = str(args["id_laptop"])
result=self.DB(self.DB.laptops_historical.id_laptop==id_laptop)(self.DB.laptops_historical.id_state==self.DB.states.id_state).select(self.DB.laptops_historical.ALL, self.DB.states.state, orderby=args['sidx']+" "+args['sord'])
result=self.DB(self.DB.laptops_historical.id_laptop==id_laptop)(self.DB.laptops_historical.id_state==self.DB.states.id_state).select(self.DB.laptops_historical.ALL, self.DB.states.state, orderby=args['sidx']+" "+args['sord']+", id_historical desc")
rows = []
for reg in result:
......
return { "page":page, "total":totalPages, "records":len(rows), "rows":rows[start:finish] }
def add(self):
def add(self):
now = datetime.datetime.now()
#sql = "INSERT INTO laptops_historical (id_historical,id_laptop,datetime,username,name,id_user_type,nif,comment,id_state) "
self.DB.laptops_historical.insert (id_laptop=self.id_laptop, datetime=now.strftime('%Y-%m-%d %H:%M:%S'), username=self.username, name = self.name, id_user_type=self.id_user_type,nif=self.nif,comment=self.comment, id_state=self.id_state)
......
return data
def getLastHistory(self):
sql="SELECT username, id_state FROM laptops_historical WHERE id_laptop='"+str(self.id_laptop)+"' ORDER BY datetime desc LIMIT 0,1"
sql="SELECT username, id_state FROM laptops_historical WHERE id_laptop='"+str(self.id_laptop)+"' ORDER BY id_historical desc LIMIT 0,1"
result = self.DB.executesql(sql)
data={"username":"","id_state":""}

Exportar a: Unified diff