Browse Source

Added support with empty database and some basic test scripts

Fixing-travis-yml
BinHong Lee 7 years ago
parent
commit
4c88b528f8
9 changed files with 65 additions and 18 deletions
  1. +3
    -0
      .gitignore
  2. +3
    -0
      .travis.yml
  3. +3
    -2
      README.md
  4. +4
    -3
      build.xml
  5. +6
    -0
      circle.yml
  6. +4
    -4
      database.txt
  7. +4
    -0
      install.sh
  8. +37
    -9
      src/main.cpp
  9. +1
    -0
      vehiclesData.json

+ 3
- 0
.gitignore View File

@@ -1,6 +1,9 @@
bin bin
obj obj
database.txt
vehiclesData.json
# Compiled Object files # Compiled Object files
*.slo *.slo
*.lo *.lo


+ 3
- 0
.travis.yml View File

@@ -0,0 +1,3 @@
language: cpp
install: ./install.sh
script: ant test

+ 3
- 2
README.md View File

@@ -7,12 +7,13 @@ For detailed code documentations, please visit [https://binhonglee.github.io/Tic


##### Disclaimer: ##### Disclaimer:


This program is still in progress and is currently in a **NOT WORKING** condition. This is due to the fact that ant does not support taking in inputs in command line thus a GUI implementation is needed for this program to function as intended.
This program is still in progress and is currently in a **NOT WORKING** condition.


## Setting up and running it ## Setting up and running it


```sh ```sh
$ git clone https://github.com/binhonglee/TicketingSystem.git $ git clone https://github.com/binhonglee/TicketingSystem.git
$ cd TicketingSystem $ cd TicketingSystem
$ ant execute
$ ant build
$ ./bin/main
``` ```

+ 4
- 3
build.xml View File

@@ -21,7 +21,7 @@
</path> </path>


<target name="targets"> <target name="targets">
<echo message="Targets are clean, build, execute, targets"/>
<echo message="Targets are clean, build, targets, test"/>
</target> </target>


<target name="build"> <target name="build">
@@ -88,10 +88,11 @@
<libset dir="${client.lib.path}" libs="${client.lib.list}"/> <libset dir="${client.lib.path}" libs="${client.lib.list}"/>
<fileset dir="${src}" includes="Person.cpp,LogInSystem.cpp,Vehicle.cpp,VehicleManager.cpp,main.cpp"/> <fileset dir="${src}" includes="Person.cpp,LogInSystem.cpp,Vehicle.cpp,VehicleManager.cpp,main.cpp"/>
</cc> </cc>

<echo message="To run the program, input './bin/main' into the command line."/>
</target> </target>


<target name="execute" depends="build">
<exec executable="./bin/main"/>
<target name="test" depends="build, clean">
</target> </target>


<target name="clean"> <target name="clean">


+ 6
- 0
circle.yml View File

@@ -0,0 +1,6 @@
dependencies:
pre:
- ./install.sh
test:
override:
- ant test

+ 4
- 4
database.txt View File

@@ -1,4 +1,4 @@
binhonglee bhlee03655 binhonglee@hotmail.com +13479618886 1
binhong binhong binhong@binhong.me +14802527013 2
who whut wtf_is_happening@binhong.me +999999999 3
testing password testing@binhong.me +601111111111 4
binhonglee bhlee03655 binhonglee@hotmail.com +13479618886 1
binhong binhong binhong@binhong.me +14802527013 2
who whut wtf_is_happening@binhong.me +999999999 3
testing password testing@binhong.me +601111111111 4

+ 4
- 0
install.sh View File

@@ -0,0 +1,4 @@
cp lib/anttasks.jar ~
pushd ~
jar xf anttasks.jar
pushd -0

+ 37
- 9
src/main.cpp View File

@@ -1,15 +1,41 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <fstream>
#include <json/json.h> #include <json/json.h>
#include <exception>
#include "VehicleManager.hpp" #include "VehicleManager.hpp"
#include "LogInSystem.hpp" #include "LogInSystem.hpp"
using namespace std; using namespace std;
int main() int main()
{ {
LogInSystem users("database.txt");
VehicleManager vehicles("vehiclesData.json");
string userFile = "database.txt";
string vehicleFile = "vehiclesData.json";
LogInSystem users;
VehicleManager vehicles;
ifstream userfile(userFile);
if (userfile)
{
users = LogInSystem(userFile);
}
else
{
users = LogInSystem();
}
ifstream vehiclefile(vehicleFile);
if (vehiclefile)
{
vehicles = VehicleManager(vehicleFile);
}
else
{
vehicles = VehicleManager();
}
int currentUser = -1; int currentUser = -1;
@@ -27,9 +53,14 @@ int main()
switch (userOption) switch (userOption)
{ {
case 1: case 1:
while (users.getWrongPass() < 3 && currentUser != -1)
if (users.getWrongPass() < 3)
{ {
currentUser = users.login(); currentUser = users.login();
if (currentUser != -1)
{
users.loggedIn(users.getUser(currentUser));
}
} }
break; break;
case 2: users.loggedIn(users.registration()); break; case 2: users.loggedIn(users.registration()); break;
@@ -39,11 +70,8 @@ int main()
} }
} }
Vehicle test = Vehicle(10, 5, 0);
users.toTxtFile(userFile);
vehicles.toJson(vehicleFile);
if (test.bookSeat(3, 4, 10))
{
cout << "Booking success" << endl;
}
test.printMap(10);
return 0;
} }

+ 1
- 0
vehiclesData.json View File

@@ -0,0 +1 @@
null

Loading…
Cancel
Save