Skip to content
This repository was archived by the owner on Jan 16, 2023. It is now read-only.

Commit 6aa035a

Browse files
Coder-ACJHPCoder-ACJHP
committed
Released version 1.1.6
Reservations error fixed, price field changed to default instance, all errors handled from scratch and added new security codes. Added new room properties window. Added new add user window. Now it will create schema and tables auto when you importing .sql file.
1 parent f0f0812 commit 6aa035a

File tree

199 files changed

+1363
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+1363
-173
lines changed

‎.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<attribute name="maven.pomderived" value="true"/>
77
</attributes>
88
</classpathentry>
9-
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
9+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
1010
<attributes>
1111
<attribute name="maven.pomderived" value="true"/>
1212
</attributes>

‎Logging Store/Logging_2017-10-12.log‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
09:57:32 12/10/2017
2+
INFO:User is : admin
3+
09:57:33 12/10/2017
4+
INFO:query.yahooapis.com
5+
09:57:33 12/10/2017
6+
INFO:IOException : api.fixer.io

‎Logging Store/Logging_2017-10-21.log‎

Lines changed: 350 additions & 0 deletions
Large diffs are not rendered by default.

‎Logging Store/Logging_2017-10-21.log.1‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
04:43:21 21/10/2017
2+
INFO:User is : coder acjhp
3+
04:43:22 21/10/2017
4+
INFO:MainFrame created successfully.
5+
06:25:22 21/10/2017
6+
INFO:User is : admin
7+
06:25:23 21/10/2017
8+
INFO:MainFrame created successfully.
9+
06:58:01 21/10/2017
10+
INFO:User is : onur_899
11+
06:58:03 21/10/2017
12+
INFO:MainFrame created successfully.
13+
06:58:10 21/10/2017
14+
INFO:Change password window is started....
15+
06:58:10 21/10/2017
16+
INFO:User is : onur_899
17+
06:58:27 21/10/2017
18+
INFO:User : onur_899old password is : 123
19+
06:58:27 21/10/2017
20+
INFO:User : onur_899new password is : onur958
21+
06:58:27 21/10/2017
22+
INFO:Password changed successfully.
23+
06:58:46 21/10/2017
24+
INFO:User is : onur_899
25+
06:58:47 21/10/2017
26+
INFO:MainFrame created successfully.
27+
06:58:50 21/10/2017
28+
INFO:User is : onur_899

‎Logging Store/Logging_2017-10-21.log.2‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
06:58:46 21/10/2017
2+
INFO:User is : onur_899
3+
06:58:47 21/10/2017
4+
INFO:MainFrame created successfully.
5+
06:58:50 21/10/2017
6+
INFO:User is : onur_899

‎src/com/coder/hms/connection/DataSourceFactory.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.sql.SQLException;
1111

1212
import org.hibernate.SessionFactory;
13+
import org.hibernate.Transaction;
1314
import org.hibernate.cfg.Configuration;
1415
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
1516

@@ -63,6 +64,10 @@ public Connection getSqlConnection() {
6364
return connection;
6465
}
6566

67+
public Transaction getTransaction() {
68+
return getSessionFactory().getCurrentSession().beginTransaction();
69+
}
70+
6671
public void shutDown() {
6772
if(sessionFactory.isOpen())
6873
sessionFactory.close();

src/com/coder/hms/connection/hotel_managment_system.sql renamed to src/com/coder/hms/connection/hotel_management_system.sql

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
CREATE DATABASE IF NOT EXISTS `hotel_managment_system` /*!40100 DEFAULT CHARACTER SET utf8 */;
2+
USE `hotel_managment_system`;
13
-- MySQL dump 10.13 Distrib 5.7.17, for macos10.12 (x86_64)
24
--
35
-- Host: 127.0.0.1 Database: hotel_managment_system
@@ -26,7 +28,7 @@ CREATE TABLE `Customer` (
2628
`CustomerId` bigint(100) NOT NULL AUTO_INCREMENT,
2729
`FirstName` varchar(45) DEFAULT NULL,
2830
`LastName` varchar(45) DEFAULT NULL,
29-
`Country` varchar(45) NOT NULL,
31+
`Country` varchar(45) DEFAULT NULL,
3032
`Document` varchar(45) DEFAULT NULL,
3133
`DocumentNo` varchar(45) DEFAULT NULL,
3234
`DateOfBirth` datetime DEFAULT NULL,
@@ -38,7 +40,7 @@ CREATE TABLE `Customer` (
3840
`ReservationId` bigint(100) NOT NULL,
3941
`Phone` varchar(45) DEFAULT NULL,
4042
PRIMARY KEY (`CustomerId`)
41-
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
43+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
4244
/*!40101 SET character_set_client = @saved_cs_client */;
4345

4446
--
@@ -47,7 +49,6 @@ CREATE TABLE `Customer` (
4749

4850
LOCK TABLES `Customer` WRITE;
4951
/*!40000 ALTER TABLE `Customer` DISABLE KEYS */;
50-
INSERT INTO `Customer` VALUES (3,'GOOGLE','JSON','United States','PASSPORT','USA-X98908','1990-02-22 06:36:00','MAN','SINGLE','LARRY','HACKMEN','google@gmail.com',4,'0555887123'),(4,'AÇELYA ','IŞIK','Virgin Islands U.S.','PASSPORT','VS346110','1990-01-10 04:48:49','WOMAN','SINGLE','EVREN','SOFIA','dilek_kelebek@gmail.com',5,'0090 505 1350067'),(5,'MAISON','ARMYEN','Brazil','PASSPORT','BR77XU1','1988-12-10 03:00:50','MAN','MARRIED','GRIGORA','ALYONA','maison_88@hotmail.com',6,'02 400 127374475');
5152
/*!40000 ALTER TABLE `Customer` ENABLE KEYS */;
5253
UNLOCK TABLES;
5354

@@ -107,7 +108,7 @@ CREATE TABLE `HotelSystemStatus` (
107108

108109
LOCK TABLES `HotelSystemStatus` WRITE;
109110
/*!40000 ALTER TABLE `HotelSystemStatus` DISABLE KEYS */;
110-
INSERT INTO `HotelSystemStatus` VALUES (1,'2017-08-30',1);
111+
INSERT INTO `HotelSystemStatus` VALUES (1,'2017-10-21',0);
111112
/*!40000 ALTER TABLE `HotelSystemStatus` ENABLE KEYS */;
112113
UNLOCK TABLES;
113114

@@ -128,7 +129,7 @@ CREATE TABLE `Payment` (
128129
`roomNumber` varchar(45) DEFAULT NULL,
129130
`dateTime` datetime DEFAULT NULL,
130131
PRIMARY KEY (`Id`)
131-
) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
132+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
132133
/*!40101 SET character_set_client = @saved_cs_client */;
133134

134135
--
@@ -137,7 +138,6 @@ CREATE TABLE `Payment` (
137138

138139
LOCK TABLES `Payment` WRITE;
139140
/*!40000 ALTER TABLE `Payment` DISABLE KEYS */;
140-
INSERT INTO `Payment` VALUES (1,'EARLY PAYMENT','CASH PAYMENT','30','DOLLAR','','3001','2017-08-26 03:50:09'),(2,'EARLY PAYMENT','CASH PAYMENT','30','EURO','','1003','2017-08-26 03:54:51'),(5,'EARLY PAYMENT','CASH PAYMENT','820','TURKISH LIRA','FEE','1002','2017-08-26 05:34:37'),(6,'EARLY PAYMENT','CASH PAYMENT','200','TURKISH LIRA','DEPOSITE','2001','2017-08-28 02:49:03'),(7,'EARLY PAYMENT','CASH PAYMENT','100','DOLLAR','DEPOSITE','3002','2017-08-29 02:17:49'),(8,'EARLY PAYMENT','CASH PAYMENT','145','TURKISH LIRA','ROOM RATES PAYMENT','2001','2017-08-29 03:54:23'),(9,'BALANCE','CASH PAYMENT','10.296','TURKISH LIRA','CASH PAYMENT','3002','2017-08-31 01:43:44'),(11,'BALANCE','CASH PAYMENT','10285','TURKISH LIRA','CASH PAYMENT','3002','2017-08-31 01:45:20'),(12,'BALANCE','CASH PAYMENT','0.7','TURKISH LIRA','DISCOUNT','3002','2017-08-31 01:45:53'),(13,'BALANCE','CASH PAYMENT','1','TURKISH LIRA','WATER FEE','3002','2017-08-31 01:56:49'),(14,'EARLY PAYMENT','CASH PAYMENT','10640','TURKISH LIRA','XXXX','3002','2017-08-31 01:58:33');
141141
/*!40000 ALTER TABLE `Payment` ENABLE KEYS */;
142142
UNLOCK TABLES;
143143

@@ -158,7 +158,7 @@ CREATE TABLE `Posting` (
158158
`roomNumber` varchar(45) DEFAULT NULL,
159159
`dateTime` datetime DEFAULT NULL,
160160
PRIMARY KEY (`Id`)
161-
) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
161+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
162162
/*!40101 SET character_set_client = @saved_cs_client */;
163163

164164
--
@@ -167,7 +167,6 @@ CREATE TABLE `Posting` (
167167

168168
LOCK TABLES `Posting` WRITE;
169169
/*!40000 ALTER TABLE `Posting` DISABLE KEYS */;
170-
INSERT INTO `Posting` VALUES (2,'ROOM RATES','SYSTEM','11440','TURKISH LIRA','ROOM RATES','3002','2017-08-30 12:52:41'),(3,'MINIBAR','SYSTEM','1','TURKISH LIRA','MINI WATER','3002','2017-08-31 01:56:16');
171170
/*!40000 ALTER TABLE `Posting` ENABLE KEYS */;
172171
UNLOCK TABLES;
173172

@@ -196,7 +195,7 @@ CREATE TABLE `Reservation` (
196195
`referanceNo` varchar(45) DEFAULT 'ZERO',
197196
PRIMARY KEY (`Id`),
198197
UNIQUE KEY `Id_UNIQUE` (`Id`)
199-
) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
198+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
200199
/*!40101 SET character_set_client = @saved_cs_client */;
201200

202201
--
@@ -205,7 +204,6 @@ CREATE TABLE `Reservation` (
205204

206205
LOCK TABLES `Reservation` WRITE;
207206
/*!40000 ALTER TABLE `Reservation` DISABLE KEYS */;
208-
INSERT INTO `Reservation` VALUES (4,'1002','2017-08-26','2017-08-29',1,'B.B','GOOGLE JSON',3,'WEB','STANDART CUSTOMER CREDIT','GUARANTEE','','YES','GOOG-00',''),(5,'2001','2017-08-29','2017-08-30',0,'B.B','AÇELYA IŞIK',1,'WEB','STANDART CUSTOMER CREDIT','GUARANTEE','PLEASE FOLLOW ROOM RATE','YES','120039',''),(6,'3002','2017-08-29','2017-08-30',1,'B.B','MAISON ARMYEN',1,'OTHER','STANDART CUSTOMER CREDIT','GUARANTEE','','YES','7701-X','');
209207
/*!40000 ALTER TABLE `Reservation` ENABLE KEYS */;
210208
UNLOCK TABLES;
211209

@@ -241,7 +239,7 @@ CREATE TABLE `Room` (
241239

242240
LOCK TABLES `Room` WRITE;
243241
/*!40000 ALTER TABLE `Room` DISABLE KEYS */;
244-
INSERT INTO `Room` VALUES (1,'1001','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(2,'1002','DOUBLE',0,0,0,'CLEAN','EMPTY',0,'',0,'',0),(3,'1003','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(4,'2001','DOUBLE',0,0,0,'DND','EMPTY',0,'',0,'',0),(5,'2002','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(6,'2003','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(7,'3001','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(8,'3002','DOUBLE',0,0,0,'DIRTY','EMPTY',0,'',0,'',0),(9,'3003','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(10,'4001','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(11,'4002','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(12,'4003','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(13,'5001','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(14,'5002','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(15,'5003','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(16,'6001','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(17,'6002','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(18,'6003','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(19,'7001','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(20,'7002','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(21,'7003','DOUBLE',0,0,0,'CLEAN','EMPTY',0,'',0,'',0),(22,'8001','DOUBLE',0,0,0,'CLEAN','EMPTY',0,'',0,'',0),(23,'8002','DOUBLE',0,0,0,'CLEAN','EMPTY',0,'',0,'',0),(24,'8003','DOUBLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(25,'1004','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(26,'1005','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(27,'2004','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(28,'2005','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(29,'3004','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(30,'3005','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(31,'4004','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(32,'4005','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(33,'5004','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(34,'5005','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(35,'6004','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(36,'6005','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(37,'7004','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(38,'7005','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(39,'8004','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(40,'8005','TWIN',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(41,'1006','TRIPLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(42,'2006','TRIPLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(43,'3006','TRIPLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(44,'4006','TRIPLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(45,'5006','TRIPLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(46,'6006','TRIPLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(47,'7006','TRIPLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0),(48,'8006','TRIPLE',0,0,0,'CLEAN','EMPTY',0,NULL,0,NULL,0);
242+
INSERT INTO `Room` VALUES (1,'1001','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(2,'1002','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(3,'1003','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(4,'2001','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(5,'2002','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(6,'2003','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(7,'3001','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(8,'3002','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(9,'3003','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(10,'4001','DOUBLE',0,0,0,'DND','EMPTY',0,NULL,0,'TURKISH LIRA',0),(11,'4002','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(12,'4003','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(13,'5001','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(14,'5002','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(15,'5003','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(16,'6001','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(17,'6002','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(18,'6003','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(19,'7001','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(20,'7002','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(21,'7003','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(22,'8001','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(23,'8002','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(24,'8003','DOUBLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(25,'1004','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(26,'1005','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(27,'2004','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(28,'2005','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(29,'3004','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(30,'3005','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(31,'4004','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(32,'4005','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(33,'5004','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(34,'5005','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(35,'6004','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(36,'6005','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(37,'7004','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(38,'7005','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(39,'8004','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(40,'8005','TWIN',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(41,'1006','TRIPLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(42,'2006','TRIPLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(43,'3006','TRIPLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(44,'4006','TRIPLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(45,'5006','TRIPLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(46,'6006','TRIPLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(47,'7006','TRIPLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0),(48,'8006','TRIPLE',0,0,0,'DIRTY','EMPTY',0,NULL,0,'TURKISH LIRA',0);
245243
/*!40000 ALTER TABLE `Room` ENABLE KEYS */;
246244
UNLOCK TABLES;
247245

@@ -261,7 +259,7 @@ CREATE TABLE `User` (
261259
`Email` varchar(45) NOT NULL,
262260
`Role` varchar(45) NOT NULL DEFAULT 'USER',
263261
PRIMARY KEY (`Id`)
264-
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
262+
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
265263
/*!40101 SET character_set_client = @saved_cs_client */;
266264

267265
--
@@ -283,4 +281,4 @@ UNLOCK TABLES;
283281
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
284282
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
285283

286-
-- Dump completed on 2017-09-18 0:27:07
284+
-- Dump completed on 2017-10-21 7:23:32

‎src/com/coder/hms/reports/ReservationForm.jrxml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -272,21 +272,21 @@
272272
<text><![CDATA[Room Type : ]]></text>
273273
</staticText>
274274
<textField>
275-
<reportElement x="240" y="260" width="40" height="21" uuid="eb5ad91e-4436-446f-8a59-2f1173fb3011"/>
275+
<reportElement x="270" y="260" width="40" height="21" uuid="eb5ad91e-4436-446f-8a59-2f1173fb3011"/>
276276
<textElement textAlignment="Left" verticalAlignment="Top">
277277
<font size="11"/>
278278
</textElement>
279279
<textFieldExpression><![CDATA[$F{balance}]]></textFieldExpression>
280280
</textField>
281281
<textField>
282-
<reportElement x="280" y="260" width="68" height="21" uuid="aecc7892-08ec-44e3-9581-5a376e117026"/>
282+
<reportElement x="310" y="260" width="68" height="21" uuid="aecc7892-08ec-44e3-9581-5a376e117026"/>
283283
<textElement textAlignment="Left" verticalAlignment="Top">
284284
<font size="11"/>
285285
</textElement>
286286
<textFieldExpression><![CDATA[$F{currency}]]></textFieldExpression>
287287
</textField>
288288
<staticText>
289-
<reportElement x="180" y="260" width="60" height="21" uuid="36654d0f-7f14-4fe4-98a5-e0b075aa726e"/>
289+
<reportElement x="210" y="260" width="60" height="21" uuid="36654d0f-7f14-4fe4-98a5-e0b075aa726e"/>
290290
<textElement verticalAlignment="Top">
291291
<font size="12" isBold="true"/>
292292
</textElement>
@@ -305,28 +305,28 @@
305305
<text><![CDATA[PAYMENT STATUS]]></text>
306306
</staticText>
307307
<textField>
308-
<reportElement x="110" y="260" width="50" height="21" uuid="59b2be17-e8bf-4031-80ff-4c3dd236dd0d"/>
309-
<textElement verticalAlignment="Top">
308+
<reportElement x="121" y="260" width="59" height="21" uuid="59b2be17-e8bf-4031-80ff-4c3dd236dd0d"/>
309+
<textElement>
310310
<font size="11"/>
311311
</textElement>
312312
<textFieldExpression><![CDATA[$F{paymentStatus}]]></textFieldExpression>
313313
</textField>
314314
<staticText>
315-
<reportElement x="10" y="260" width="100" height="21" uuid="88801086-9608-41de-b946-5327c5fb2054"/>
315+
<reportElement x="10" y="260" width="111" height="21" uuid="88801086-9608-41de-b946-5327c5fb2054"/>
316316
<textElement>
317317
<font size="12" isBold="true"/>
318318
</textElement>
319319
<text><![CDATA[Early Payment : ]]></text>
320320
</staticText>
321321
<textField>
322-
<reportElement x="470" y="260" width="80" height="21" uuid="068c274d-12a0-4d5c-8304-184d90febf27"/>
323-
<textElement verticalAlignment="Top">
322+
<reportElement x="496" y="260" width="80" height="21" uuid="068c274d-12a0-4d5c-8304-184d90febf27"/>
323+
<textElement>
324324
<font size="11"/>
325325
</textElement>
326326
<textFieldExpression><![CDATA[$F{paymentType}]]></textFieldExpression>
327327
</textField>
328328
<staticText>
329-
<reportElement x="374" y="260" width="96" height="21" uuid="01efb919-a200-40e6-98a2-c876127547f1"/>
329+
<reportElement x="400" y="260" width="96" height="21" uuid="01efb919-a200-40e6-98a2-c876127547f1"/>
330330
<textElement>
331331
<font size="12" isBold="true"/>
332332
</textElement>

‎src/com/coder/hms/roomsControl/RoomsControllAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.coder.hms.entities.HotelSystemStatus;
2020
import com.coder.hms.entities.Reservation;
2121
import com.coder.hms.entities.Room;
22-
import com.coder.hms.ui.external.Reserved_CheckinWindow;
22+
import com.coder.hms.ui.external.ReservedCheckinWindow;
2323
import com.coder.hms.ui.external.RoomWindow;
2424
import com.coder.hms.ui.external.Walkin_CheckinWindow;
2525

@@ -113,7 +113,7 @@ else if (theRoom.getUsageStatus().equals("BLOCKED")
113113
@Override
114114
public void run() {
115115

116-
new Reserved_CheckinWindow(theRoom.getNumber()).setVisible(true);
116+
new ReservedCheckinWindow(theRoom.getNumber()).setVisible(true);
117117

118118
}
119119
});

0 commit comments

Comments
 (0)