Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
b80a719
Delete System/src directory
parsaa9 Apr 30, 2021
b2698ae
Add files via upload
parsaa9 Apr 30, 2021
9d29475
Delete pom.xml
parsaa9 Apr 30, 2021
feaa89e
Add files via upload
parsaa9 Apr 30, 2021
c7d6566
Update Container.java
parsaa9 Apr 30, 2021
ad2271c
Update HistoryBook.java
parsaa9 Apr 30, 2021
57315a9
M2 large updates
Apr 30, 2021
e30f3d1
Maximum test coverage has been achieved for M2. NOT GUI RELATED ONLY
May 1, 2021
c19b23f
JUnit tests Container and ContainerDatabase classes
May 1, 2021
b3966bc
JUnit tests journey class
May 1, 2021
79376a4
ContainerDatabase test updates
May 1, 2021
991a738
update position button removed from update screen
May 1, 2021
b0562c0
stepdef m3 done
May 1, 2021
49e745b
Minor change
May 1, 2021
7e34d01
Journey test complete
May 1, 2021
f3768f1
Merge branch 'Newagilebranch' of https://github.com/Alanocorleo/Remot…
May 1, 2021
cd954bf
JUnit tests complete for M2
May 1, 2021
16c66b4
Code comments are added. Junit tests, some improvements.
May 2, 2021
0117e1e
unit tests for m3 done
May 2, 2021
dfcd5b0
M3 all comments done,(controllers/view/historybook)
May 2, 2021
6326cfb
Minor update
May 2, 2021
1ddc305
Merge branch 'Newagilebranch' of https://github.com/Alanocorleo/Remot…
May 2, 2021
bcbb07e
Delete StepDefinitionM1.java
ousamamhadden May 2, 2021
6ade53b
Add files via upload
ousamamhadden May 2, 2021
b5c8bad
Delete ClientUpdate.feature
ousamamhadden May 2, 2021
7b66874
Delete ContactClient.feature
ousamamhadden May 2, 2021
d52ddfb
Delete RegisterClients.feature
ousamamhadden May 2, 2021
aa9ec02
Add files via upload
ousamamhadden May 2, 2021
ad1445f
Delete User.java
ousamamhadden May 2, 2021
fde8c0a
Delete Client.java
ousamamhadden May 2, 2021
6b92fd3
Delete ClientDatabase.java
ousamamhadden May 2, 2021
e226182
Delete LogisticsCompany.java
ousamamhadden May 2, 2021
da7aa38
Add files via upload
ousamamhadden May 2, 2021
a453490
Delete Session.java
ousamamhadden May 2, 2021
b43e919
Delete MainMenuClientController.java
ousamamhadden May 2, 2021
937cd97
Delete MainMenuCompanyController.java
ousamamhadden May 2, 2021
fcba598
Delete FriendsMainMenuController.java
ousamamhadden May 2, 2021
62266df
Delete ApplicationController.java
ousamamhadden May 2, 2021
9628659
Delete ClientPersonalInfoController.java
ousamamhadden May 2, 2021
dc77b94
Delete DisplayClientsController.java
ousamamhadden May 2, 2021
ee55f37
Delete LoginController.java
ousamamhadden May 2, 2021
47f029b
Delete CompanyPersonalInfoController.java
ousamamhadden May 2, 2021
27e7339
Add files via upload
ousamamhadden May 2, 2021
dbd882a
Delete Testing2.java
ousamamhadden May 2, 2021
14e4752
Add files via upload
ousamamhadden May 2, 2021
4a4cdda
Delete ClientPersonalInfoView.java
ousamamhadden May 2, 2021
54a956b
Delete CompanyPersonalInfoView.java
ousamamhadden May 2, 2021
da3aabb
Delete DisplayClientsView.java
ousamamhadden May 2, 2021
f5c58ce
Delete FriendsMainMenuView.java
ousamamhadden May 2, 2021
a9b5a9b
Delete LoginView.java
ousamamhadden May 2, 2021
033085f
Delete MainMenuClientView.java
ousamamhadden May 2, 2021
4619e2e
Delete MainMenuCompanyView.java
ousamamhadden May 2, 2021
69bf946
Add files via upload
ousamamhadden May 2, 2021
a22a989
jar exec
May 2, 2021
7478d1b
Merge branch 'Newagilebranch' of https://github.com/Alanocorleo/Remot…
May 2, 2021
0fcafab
Journey database tests fixed
May 2, 2021
213120a
Merge branch 'Newagilebranch' of https://github.com/Alanocorleo/Remot…
May 2, 2021
4406c42
An executable jar has been created. Some buges have been fixed.
May 2, 2021
eea4381
done
parsaa9 May 2, 2021
d047c81
Update README.md
parsaa9 May 2, 2021
cc4d869
Last update.
May 2, 2021
1ad8302
Merge branch 'Newagilebranch' of https://github.com/Alanocorleo/Remot…
May 2, 2021
4f7ee5e
Test commit.
May 2, 2021
0d335c2
The very last update.
May 2, 2021
857bc6c
The very very last update.
May 2, 2021
133e980
Update
May 2, 2021
c3b1620
Update
May 2, 2021
159ac5d
Final commit
May 2, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# Download the "JAR.FILE.IS.IN.HERE" zip file from final release, extract and run the .jar file
there are a few example databases in that zip as well, however you can delete the .json files in case you do not need any example data






# Remote-Container-Management

Use Eclipse to edit the repository by either pulling, or committing and pushing.
Expand All @@ -9,8 +17,3 @@ Thereafter, when starting a work session, be sure to pull in order to get the up
The convetion for writing packages: myPackage;
classes: Class;
methods: method.





6 changes: 1 addition & 5 deletions System/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
Expand Down
6 changes: 3 additions & 3 deletions System/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand All @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.source=1.8
Binary file added System/UMLdiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
230 changes: 230 additions & 0 deletions System/UMLdiagram.ucls
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@
<?xml version="1.0" encoding="UTF-8"?>
<class-diagram version="1.2.4" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
realizations="true" associations="true" dependencies="true" nesting-relationships="true" router="FAN">
<class id="1" language="java" name="management.Journey" project="System"
file="/System/src/main/java/management/Journey.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="321" y="1511"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="2" language="java" name="management.Container" project="System"
file="/System/src/main/java/management/Container.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="832" y="1680"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="3" language="java" name="management.HistoryBook" project="System"
file="/System/src/main/java/management/HistoryBook.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="836" y="2317"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="4" language="java" name="management.JourneyDatabase" project="System"
file="/System/src/main/java/management/JourneyDatabase.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="323" y="849"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="5" language="java" name="management.ContainerDatabase" project="System"
file="/System/src/main/java/management/ContainerDatabase.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="832" y="849"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="6" language="java" name="management.Client" project="System"
file="/System/src/main/java/management/Client.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="1879" y="393"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="7" language="java" name="management.LogisticsCompany" project="System"
file="/System/src/main/java/management/LogisticsCompany.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="963" y="240"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="8" language="java" name="management.ClientDatabase" project="System"
file="/System/src/main/java/management/ClientDatabase.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="1308" y="868"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<association id="9">
<end type="SOURCE" refId="1" navigable="false">
<attribute id="10" name="journeyDatabase">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="11" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="4" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="12">
<end type="SOURCE" refId="2" navigable="false">
<attribute id="13" name="history">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="14" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="3" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<dependency id="15">
<bendpoint x="1268" y="239"/>
<bendpoint x="1447" y="239"/>
<bendpoint x="1447" y="393"/>
<end type="SOURCE" refId="7"/>
<end type="TARGET" refId="6"/>
</dependency>
<association id="16">
<bendpoint x="1561" y="492"/>
<bendpoint x="321" y="492"/>
<end type="SOURCE" refId="6" navigable="false">
<attribute id="17" name="myJourneys">
<position height="22" width="91" x="227" y="517"/>
</attribute>
<multiplicity id="18" minimum="0" maximum="1">
<position height="20" width="31" x="324" y="518"/>
</multiplicity>
</end>
<end type="TARGET" refId="4" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="19">
<bendpoint x="964" y="500"/>
<bendpoint x="831" y="500"/>
<end type="SOURCE" refId="7" navigable="false">
<attribute id="20" name="containerDatabase">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="21" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="5" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="22">
<bendpoint x="1879" y="868"/>
<end type="SOURCE" refId="8" navigable="false">
<attribute id="23" name="clients">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="24" minimum="0" maximum="2147483647">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="6" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<dependency id="25">
<bendpoint x="322" y="1207"/>
<bendpoint x="603" y="1207"/>
<bendpoint x="603" y="1680"/>
<end type="SOURCE" refId="4"/>
<end type="TARGET" refId="2"/>
</dependency>
<association id="26">
<end type="SOURCE" refId="5" navigable="false">
<attribute id="27" name="containers">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="28" minimum="0" maximum="2147483647">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="2" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="29">
<bendpoint x="964" y="482"/>
<bendpoint x="1237" y="482"/>
<bendpoint x="1237" y="239"/>
<end type="SOURCE" refId="7" navigable="false">
<attribute id="30" name="instance">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="31" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="7" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="32">
<bendpoint x="964" y="500"/>
<bendpoint x="514" y="500"/>
<bendpoint x="321" y="500"/>
<end type="SOURCE" refId="7" navigable="false">
<attribute id="33" name="journeyDatabase">
<position height="22" width="127" x="191" y="535"/>
</attribute>
<multiplicity id="34" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="4" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="35">
<bendpoint x="964" y="500"/>
<bendpoint x="1307" y="500"/>
<end type="SOURCE" refId="7" navigable="false">
<attribute id="36" name="clientDatabase">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="37" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="8" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="38">
<bendpoint x="1879" y="1680"/>
<end type="SOURCE" refId="6" navigable="false">
<attribute id="39" name="myContainers">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="40" minimum="0" maximum="2147483647">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="2" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</classifier-display>
<association-display labels="true" multiplicity="true"/>
</class-diagram>
Binary file added System/cargo_blue.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 81 additions & 0 deletions System/client_database.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"clients" : [ {
"myContainers" : [ ],
"myJourneys" : {
"journeys" : { }
},
"id" : 1,
"fistName" : "Alan",
"lastName" : "Mansour",
"birthDate" : "21/04/2021",
"email" : "Alan.Mansour@mail.com",
"password" : "0000",
"phoneNumber" : "0000000001",
"friends" : [ ]
}, {
"myContainers" : [ ],
"myJourneys" : {
"journeys" : { }
},
"id" : 2,
"fistName" : "Javier",
"lastName" : "Almendra",
"birthDate" : "21/04/2021",
"email" : "Javier.Almendra@mail.com",
"password" : "0000",
"phoneNumber" : "0000000002",
"friends" : [ ]
}, {
"myContainers" : [ ],
"myJourneys" : {
"journeys" : { }
},
"id" : 3,
"fistName" : "Kristyn",
"lastName" : "Korboe",
"birthDate" : "21/04/2021",
"email" : "Kristyn.Korboe@mail.com",
"password" : "0000",
"phoneNumber" : "0000000003",
"friends" : [ ]
}, {
"myContainers" : [ ],
"myJourneys" : {
"journeys" : { }
},
"id" : 4,
"fistName" : "Ousama",
"lastName" : "Mhadden",
"birthDate" : "21/04/2021",
"email" : "Ousama.Mhadden@mail.com",
"password" : "0000",
"phoneNumber" : "0000000004",
"friends" : [ ]
}, {
"myContainers" : [ ],
"myJourneys" : {
"journeys" : { }
},
"id" : 5,
"fistName" : "Parsa",
"lastName" : "Mehrizi",
"birthDate" : "21/04/2021",
"email" : "Parsa.Mehrizi@mail.com",
"password" : "0000",
"phoneNumber" : "0000000005",
"friends" : [ ]
}, {
"myContainers" : [ ],
"myJourneys" : {
"journeys" : { }
},
"id" : 6,
"fistName" : "Sarthak",
"lastName" : "Trehan",
"birthDate" : "21/04/2021",
"email" : "Sarthak.Trehan@mail.com",
"password" : "0000",
"phoneNumber" : "0000000006",
"friends" : [ ]
} ]
}
Loading