--- ResultDetailsDialog.cpp 2006/09/12 09:09:30 54 +++ ResultDetailsDialog.cpp 2006/09/12 10:15:12 55 @@ -204,7 +204,7 @@ check.m_checkoutMode = true; Reservation topReservation; - if (m_equipment.status == "Reserveret") { + if (m_equipment.statusid == StatusReserved) { topReservation = m_equipment.reservations[0]; check.m_reservedTo = topReservation.inits; @@ -217,10 +217,10 @@ Equipment eq; GetDlgItem(IDC_BARCODE)->GetWindowText(eq.barcode); - + dblayer->CheckoutEquipment(p, eq, atoi(check.m_numdays) ); - if (m_equipment.status == "Reserveret") { //if the equipment was reserved, we must delete the reservation + if (m_equipment.statusid == StatusReserved) { //if the equipment was reserved, we must delete the reservation dblayer->DeleteReservation(eq.barcode, topReservation.reservationID); } this->ReloadData(); @@ -271,15 +271,15 @@ void ResultDetailsDialog::EnableControls(void) { if (CommonStorage::Instance()->getAdmin() ) { - if (m_equipment.status == "Ledig") { + if (m_equipment.statusid == StatusAvailable) { GetDlgItem(IDC_CHECKOUT)->EnableWindow(true); GetDlgItem(IDC_RETURN)->EnableWindow(false); GetDlgItem(IDC_RESERVE)->EnableWindow(false); - } else if (m_equipment.status == "Udlånt") { + } else if (m_equipment.statusid == StatusCheckedout) { GetDlgItem(IDC_CHECKOUT)->EnableWindow(false); GetDlgItem(IDC_RETURN)->EnableWindow(true); GetDlgItem(IDC_RESERVE)->EnableWindow(true); - } else { //m_equipment.status == "Reserveret" + } else { //m_equipment.statusid == StatusReserved GetDlgItem(IDC_CHECKOUT)->EnableWindow(true); GetDlgItem(IDC_RETURN)->EnableWindow(false); GetDlgItem(IDC_RESERVE)->EnableWindow(true);