Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit e7a00f1

Browse files
authored
Merge pull request #2 from JacobDerg/main
Improvements
2 parents a7ddfba + 4b1e5ce commit e7a00f1

24 files changed

+417
-301
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/nbproject/private/
2+
/build/
3+
/dist/

‎FAdmin.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
11000 Müdür Ahmet a 56 yönetim 12.023 0
2-
11001 MüdürY. Mehmet b 45 yönetim 10.546 1
3-
11002 CEO Ayşe c 38 yönetim 11.123 2
4-
11003 Üye1 Elif d 42 yönetim 10.456 3
5-
11004 Üye2 Umut e 65 yönetim 12.000 4
1+
11000 Professor Festus O. 49 Management 120.000 312
2+
11001 Associate Dylan B. 23 Management 100.546 1
3+
11002 Associate Luke C. 54 Management 110.123 2
4+
11003 Associate Cassie D. 25 Management 100.456 3
5+
11004 CEO Jacob B. 20 Management 120.000 7

‎FEmployee.txt

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
12000 Merve f 48 bilişim 8856 1000 0
2-
12001 Aslı g 32 üretim 8951 1001 1
3-
12002 Ufuk h 28 üretim 7959 1003 2
4-
12003 Kadir k 53 bilişim 5213 1002 3
5-
13001 Murat i 28 test 6753 1002 4
6-
13002 Beyza l 36 bilişim 7123 1002 5
7-
13003 Efe m 32 test 5891 1000 6
8-
13004 Kübra n 29 üretim 6546 1000 7
9-
13005 Fatih t 30 test 7005 1001 8
10-
13006 Kerim s 41 üretim 7564 1001 9
11-
13007 Sıla y 35 bilişim 6943 1003 10
12-
13008 Dilan z 45 üretim 5963 1003 11
13-
13009 Emre x 35 üretim 7591 - 12
14-
12130 Dilara Patır 28 bilişim 12000 1004 574
15-
12964 ceyda patır 23 bilişim 5000.0 - 18
16-
13828 zeynep doğan 34 Bilişim 3000.0 - 904
17-
13365 Ahmet Uyan 54 Tasarım 4500.0 - 907
18-
13255 Ahmet Yılmaz 54 Üretim 4500.0 1004 956
19-
13145 Canan Öztürk 44 Üretim 4500.0 1004 954
20-
13348 Mesut Yılmaz 45 Bilişim 3000.0 - 683
1+
12000 Samuel F. 48 Jr. Employee 60000 1007 0
2+
12001 Ashley B. 32 Jr. Employee 60000 - 1
3+
12002 Richard Y. 28 Employee 50000 1006 2
4+
12003 Michael B. 53 Sr. Partner 100000 - 3
5+
12004 Nancy L. 28 Sr. Employee 75000 - 4
6+
12005 Brooke P. 27 Jr. Employee 60000 - 5
7+
12006 Josh U. 32 Employee 45000 1005 6
8+
12007 Daniel O. 29 Employee 45000 - 7
9+
12008 Shannon W. 30 Jr. Employee 60000 - 8
10+
12009 Mike R. 30 Employee 35000 - 9
11+
12010 Walter W. 52 Employee 35000 - 10
12+
12011 Harvey S. 45 Sr. Employee 65000 - 11
13+
12012 Gale B. 35 Employee 35000 - 12
14+
12013 Donald T. 79 Employee 35000 - 574
15+
12014 Donna P. 23 Sr. Employee 70000 - 18
16+
12015 Jesse P. 34 Employee 45000 - 904
17+
12016 Rachel Z. 54 Employee 45000 1111 907
18+
12017 Sheldon C. 54 Employee 45000 1112 956
19+
12018 Michael E. 61 Employee 45000 - 954
20+
12019 George C. 45 Jr. Employee 60000 - 683
21+
12020 Toby B. 20 Employee 45000 10080 546
22+
12021 Jacob B. 20 Management 80000 - 700

‎FProject.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
1000 12000 Proje0 01/02/2021 01/04/2022 2 50.000 60.000 20
2-
1001 12001 Proje1 01/02/2021 01/08/2021 2 50.000 70.000 30
3-
1002 12003 Proje2 01/02/2021 01/04/2022 2 50.000 60.000 20
4-
1003 12002 Proje3 01/01/2020 01/01/2025 2 30000 36000.0 0
5-
1004 12130 Proje4 01/01/2020 01/01/2022 2 30000 36000.0 0
1+
1001 12001 Project2 15/12/2021 01/08/2030 2 50.000 70.000 30
2+
1003 12002 Project4 15/01/2023 09/08/2030 2 30000 36000.0 0
3+
1004 13455 Project5 01/12/2023 01/12/2030 2 30000 36000.0 0
4+
1006 12002 Project6 23/04/2025 23/05/2025 2 5000 6000.0 0
5+
1007 12000 Project7 25/04/2025 25/05/2025 2 150 180.0 0
6+
10080 12020 Project8 23/04/2025 01/06/2025 2 50000 60000.0 0
7+
1111 12016 Jacob Project 23/04/2025 01/07/2025 4 400 480.0 0
8+
1112 12017 Jacob Project 23/04/2025 01/07/2025 4 400 480.0 0

‎README.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
## How to use Project Management System
2+
3+
4+
When prompted with the "Enter Your Info" screen, you can use various Administrator or Employee IDs to grant access to the system.
5+
6+
These IDs are provided in the first column of the information listed in "FAdmin.txt" or "FEmployee.txt".
7+
8+
I have provided an example login below for your convenience.
9+
10+
11+
___
12+
### Admin:
13+
Company ID: 11000
14+
15+
Company Password: 312
16+
17+
### Employee:
18+
Company ID: 12006
19+
20+
Company Password: 6
21+
___
22+
23+
When you have successfully logged into the system, select "Show My Info" to display your employee information.
24+
25+
> If you are an administrator, you have the added ability to create employees.
26+
27+
You will be provided with four project processes:
28+
1. Search or Delete Project
29+
2. Add New Employee
30+
3. Create a New Project
31+
4. Company Info
32+
33+
34+
35+
## Search or Delete Project
36+
Here, you can search for a valid Project ID to view its information.
37+
38+
Some of this information includes: Project Name, Due Date, Budget, and Completion.
39+
40+
You may also choose to delete a project on this screen.
41+
42+
## Add New Employee
43+
> Please note that this is an administrator-only feature.
44+
45+
Here, you can enter a new employee's information such as Nane, Age, and Base Salary.
46+
47+
When "ADD" is selected, the employee will be added to FEmployee.txt
48+
49+
## Create a New Project
50+
Here, you can create a new project for your company, as well as add new employees to the project.
51+
52+
Start and due dates must be in the following order: DD/MM/YYYY
53+
54+
When "Add Project" is selected, the project will be added to FProject.txt
55+
56+
## Company Info
57+
Here, you can view various data for the company: Project Info, Administration Info, and Employee Info.
58+
59+
When "DISPLAY" is selected, all information you requested will be provided in list format.
60+
61+
For projects, this includes Project ID, Budget, Expected Profit, and Progress.
62+
63+
For employees/administrators, this includes Name, Job, Age, and Base Salary.
-545 Bytes
Binary file not shown.

‎build/classes/StartFrame4ドル.class

-529 Bytes
Binary file not shown.

‎nbproject/build-impl.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ is divided into following sections:
4646
<property file="${user.properties.file}"/>
4747
<!-- The two properties below are usually overridden -->
4848
<!-- by the active platform. Just a fallback. -->
49-
<property name="default.javac.source" value="1.6"/>
50-
<property name="default.javac.target" value="1.6"/>
49+
<property name="default.javac.source" value="1.8"/>
50+
<property name="default.javac.target" value="1.8"/>
5151
</target>
5252
<target depends="-pre-init,-init-private,-init-user" name="-init-project">
5353
<property file="nbproject/configs/${config}.properties"/>
@@ -1686,6 +1686,7 @@ is divided into following sections:
16861686
</target>
16871687
<target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
16881688
<target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
1689+
<target depends="debug-test-method" name="debug-single-method"/>
16891690
<target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
16901691
<j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
16911692
</target>

‎nbproject/genfiles.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=f85dc8f2@1.93.0.48
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
66
nbproject/build-impl.xml.data.CRC32=07d57c3e
7-
nbproject/build-impl.xml.script.CRC32=cd9053c5
8-
nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.93.0.48
7+
nbproject/build-impl.xml.script.CRC32=4761027b
8+
nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.111.0.48

‎src/AbsProject.java

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
public abstract class AbsProject {
1414
public static String GetFromFile(String fileName, String searchid) throws FileNotFoundException, IOException{
15-
// search işlemleri için kullanılır
15+
1616
int i=-1;
1717
String[] infos;
18-
String str="This file is empty!!!";
18+
String str="This file is empty!";
1919
BufferedReader bReader = new BufferedReader(new FileReader(new File(fileName)));
2020
String line;
2121
int index=0;
@@ -24,12 +24,12 @@ public static String GetFromFile(String fileName, String searchid) throws FileNo
2424
i++;
2525
infos=line.split("\t");
2626

27-
//aranan id ye sahip satırı tutar ve döndürür
27+
2828
if(infos[0].equalsIgnoreCase(searchid)){
2929
str = line;
3030
break;
3131
}else{
32-
str="this id is not exist!!!";
32+
str="This ID does not exist.";
3333
}
3434
}
3535
bReader.close();
@@ -39,13 +39,13 @@ public static String GetFromFile(String fileName, String searchid) throws FileNo
3939
}
4040

4141
public static String AddFile(String fileName, String searchid, String Info) throws FileNotFoundException, IOException{
42-
//proje ve proje çalışanı ekleme işlemleri için kullanılır
42+
4343
int x=0;
4444
int x2=0;
4545
int i=-1;
4646
String[] infos;
4747
String str="";
48-
String message="added successfully !!!";
48+
String message="Added successfully!";
4949
BufferedReader bReader = new BufferedReader(new FileReader(new File(fileName)));
5050
String line;
5151

@@ -55,40 +55,36 @@ public static String AddFile(String fileName, String searchid, String Info) thro
5555
infos=line.split("\t");
5656
str+=line+"\n";
5757

58-
/*
59-
eklenmesi istenilen id ye sahip satırların zaten var olup olmadığına
60-
bakar varsa uyarı mesajını buna göre düzenler ve döngüyü sonlandırır
61-
x sayacını kullanılmak üzere düzenler*/
58+
6259
if(infos[0].equalsIgnoreCase(searchid)){
63-
message="This id is already exist on the system!!!";
60+
message="This ID already exists on the system.";
6461
x=1;
6562
break;
6663
}
6764
}
6865
bReader.close();
6966

70-
// x sayacı 0 ise eklenmek istenilen id eklenebilirdir ve ekleme işlemi yapılır
67+
7168
if(x==0){
7269
String[] str3=Info.split("\t");
7370
str+=Info ;
7471
BufferedWriter bWriter = new BufferedWriter(new FileWriter(new File(fileName)));
7572
bWriter.write(str);
7673
bWriter.close();
7774

78-
//hangi dosyaya ekleme yapılacağını sorgular
75+
7976
if(fileName.equalsIgnoreCase("FProject.txt")){
8077

8178
BufferedReader bReader2 = new BufferedReader(new FileReader(new File("FEmployee.txt")));
8279
String line2,str2="";
8380
String[] infos2;
8481

85-
//proje için istenilen proje müdürünün başka projesi olup olmadığı kontrol edilir
82+
8683
while((line2 = bReader2.readLine()) != null){
8784

8885
infos2=line2.split("\t");
8986

90-
/*proje müdürünün başka projesi yoksa ekleme işlemi yapılır
91-
ve müdürün proje bilgisini oluşturulan proje id si eklenir*/
87+
9288
if(infos2[6].equalsIgnoreCase("-") && infos2[0].equalsIgnoreCase(str3[1])){
9389
infos2[6]=searchid;
9490
line2=infos2[0]+"\t"+infos2[1]+"\t"+infos2[2]+"\t"+infos2[3]+"\t"+infos2[4]+"\t"+infos2[5]+"\t"+infos2[6]+"\t"+infos2[7]+"\n";
@@ -99,9 +95,9 @@ public static String AddFile(String fileName, String searchid, String Info) thro
9995
}
10096
}
10197

102-
//Proje müdürünün başka projesi varsa mesaj buna göre düzenlenir ve proje eklenmez
98+
10399
if(x2==0){
104-
message="This project Manager already have a project!!!";
100+
message="This Project Manager is occupied.";
105101
}
106102

107103
bReader2.close();

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /