Proyecto

General

Perfil

« Anterior | Siguiente » 

Revisión 388

Cambios en la base de datos

Ver diferencias:

controlies/trunk/applications/controlies/models/menu.py
]
)]
#response.menu+=[('Base de Datos', False, None,[
# ('Portátiles', False,URL( 'laptops', 'index')),
# ('Grupos', False,URL( 'laptops_groups', 'index')),
# ('Marcas', False,URL( 'laptops_trademarks', 'index')),
# ]
# )]
response.menu+=[('Base de Datos', False, None,[
('Portátiles', False,URL( 'laptops', 'index')),
('Grupos', False,URL( 'laptops_groups', 'index')),
('Marcas', False,URL( 'laptops_trademarks', 'index')),
]
)]
response.menu+=[('Acerca de', False, 'javascript:showInfo()')]
controlies/trunk/applications/controlies/controllers/laptops_groups.py
sql = "SELECT lh.username, l.serial_number FROM laptops l"
sql = sql+" LEFT JOIN laptops_historical lh ON l.id_laptop=lh.id_laptop"
sql = sql+" GROUP BY l.id_laptop ORDER BY lh.datetime desc"
result = cdb.executesql(sql)
my = SQLiteConnection()
db = my.getDB()
result = db.executesql(sql)
serials={}
for r in result:
if str(r[0])!="":
......
@auth.requires_login()
def modifySerialNumber():
serialNumber = request.vars["serial_number"].strip()
my = SQLiteConnection()
if serialNumber=="":
response = "unassignment"
else:
l = Laptops(my,"","","")
l = Laptops(cdb,"","","")
id_laptop = l.existsSerialNumber(serialNumber)
response=""
if not id_laptop:
response = "not_exists"
else:
lh = LaptopsHistory(my,"",id_laptop,"","","","","","")
lh = LaptopsHistory(cdb,"",id_laptop,"","","","","","")
data = lh.getLastHistory()
if data["username"]!="" and data["username"]!=request.vars['id']:
response = "already_assigned"
......
else:
userData = getUserData(request.vars["id"])
lh = LaptopsHistory(my,"",id_laptop,"2","2",userData["nif"],request.vars["id"],userData["name"],"Reasignado")
lh = LaptopsHistory(cdb,"",id_laptop,"2","2",userData["nif"],request.vars["id"],userData["name"],"Reasignado")
lh.add()
response="OK"
......
serialNumber = request.vars["serial_number"].strip()
newSerialNumber = request.vars["newSerial"].strip()
my = SQLiteConnection()
l = Laptops(my,"","","")
l = Laptops(cdb,"","","")
if serialNumber!="":
id_laptop = l.existsSerialNumber(serialNumber)
unassignmentLaptop(my,id_laptop)
unassignmentLaptop(id_laptop)
if newSerialNumber!="":
userData = getUserData(request.vars["username"])
id_laptop = l.existsSerialNumber(newSerialNumber)
lh = LaptopsHistory(my,"",id_laptop,"2","2",userData["nif"],request.vars["username"],userData["name"],"Reasignado")
lh = LaptopsHistory(cdb,"",id_laptop,"2","2",userData["nif"],request.vars["username"],userData["name"],"Reasignado")
lh.add()
return dict(response="OK")
......
@auth.requires_login()
def addLaptop():
serialNumber = request.vars["serial_number"].strip()
my = SQLiteConnection()
l = Laptops(my,"",serialNumber,request.vars["id_trademark"])
l = Laptops(cdb,"",serialNumber,request.vars["id_trademark"])
response = l.process("add")
if response=="OK":
userData = getUserData(request.vars["username"])
max = l.getMaxId()
lh = LaptopsHistory(my,"",max,"2","2",userData["nif"],request.vars["username"],userData["name"],"Reasignado")
lh = LaptopsHistory(cdb,"",max,"2","2",userData["nif"],request.vars["username"],userData["name"],"Reasignado")
id_laptop = lh.userAssignment()
if id_laptop:
......
ld.close()
return userData
def unassignmentLaptop(my,id_laptop):
unassignment = LaptopsHistory(my,"",id_laptop,"1","","","","","Desasignado")
def unassignmentLaptop(id_laptop):
unassignment = LaptopsHistory(cdb,"",id_laptop,"1","","","","","Desasignado")
unassignment.add()
def search():
controlies/trunk/applications/controlies/modules/LaptopsHistory.py
self.id_historical = str(id_historical)
self.id_laptop = str(id_laptop)
self.id_state = str(id_state)
self.id_user_type = str(id_user_type)
try:
self.id_user_type = int(id_user_type)
except ValueError:
self.id_user_type = 0
#self.id_user_type = int(id_user_type)
self.nif = str(nif)
self.username = str(username)
self.name = str(name)
......
#sql = "SELECT id_historical, datetime, state, username, name, comment FROM laptops_historical lh INNER JOIN states s ON lh.id_state=s.id_state"
#sql = sql + " WHERE lh.id_laptop='"+str(args["id_laptop"])+"'"
#sql = sql + " ORDER BY "+args['sidx']+" "+args['sord']
import pdb
pdb.set_trace()
#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'])
rows = []
for reg in result:
......
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) "
#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 "OK"

Exportar a: Unified diff