Skip to content

Commit 708055c

Browse files
committed
0.3
1 parent 8e7fc85 commit 708055c

22 files changed

Lines changed: 927 additions & 204 deletions

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,4 +360,5 @@ MigrationBackup/
360360
.ionide/
361361

362362
# Fody - auto-generated XML schema
363-
FodyWeavers.xsd
363+
FodyWeavers.xsd
364+
/StudentProgram.UnitTest

StudentProgramCsharp.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Global
1111
Release|Any CPU = Release|Any CPU
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{C7CD3BFD-1731-44B6-99D9-72A8F6534307}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{C7CD3BFD-1731-44B6-99D9-72A8F6534307}.Debug|Any CPU.Build.0 = Debug|Any CPU
14+
{C7CD3BFD-1731-44B6-99D9-72A8F6534307}.Debug|Any CPU.ActiveCfg = Release|Any CPU
15+
{C7CD3BFD-1731-44B6-99D9-72A8F6534307}.Debug|Any CPU.Build.0 = Release|Any CPU
1616
{C7CD3BFD-1731-44B6-99D9-72A8F6534307}.Release|Any CPU.ActiveCfg = Release|Any CPU
1717
{C7CD3BFD-1731-44B6-99D9-72A8F6534307}.Release|Any CPU.Build.0 = Release|Any CPU
1818
EndGlobalSection

StudentProgramCsharp/App.config

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,33 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5-
<section name="StudentProgramCsharp.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6-
</sectionGroup>
7-
</configSections>
8-
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
10-
</startup>
11-
<userSettings>
12-
<StudentProgramCsharp.Properties.Settings>
13-
<setting name="SettingUrl" serializeAs="String">
14-
<value />
15-
</setting>
16-
<setting name="SettingStatus" serializeAs="String">
17-
<value />
18-
</setting>
19-
</StudentProgramCsharp.Properties.Settings>
20-
</userSettings>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="StudentProgramCsharp.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6+
</sectionGroup>
7+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
8+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
9+
</configSections>
10+
<startup>
11+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
12+
</startup>
13+
<userSettings>
14+
<StudentProgramCsharp.Properties.Settings>
15+
<setting name="SettingUrl" serializeAs="String">
16+
<value />
17+
</setting>
18+
<setting name="SettingStatus" serializeAs="String">
19+
<value />
20+
</setting>
21+
<setting name="DontShow" serializeAs="String">
22+
<value>False</value>
23+
</setting>
24+
</StudentProgramCsharp.Properties.Settings>
25+
</userSettings>
26+
<entityFramework>
27+
<providers>
28+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
29+
<provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
30+
</providers>
31+
</entityFramework>
32+
2133
</configuration>

StudentProgramCsharp/Database.rar

5.94 KB
Binary file not shown.

StudentProgramCsharp/Form1.cs

Lines changed: 88 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static Form1 Instance
3636
}
3737

3838
public Form1()
39-
{
39+
{
4040
InitializeComponent();
4141
_obj = this;
4242
}
@@ -57,49 +57,54 @@ private void Form1_Load(object sender, EventArgs e)
5757
//Fun for adding items to Program page
5858
private void popuProgramItems()
5959
{
60-
CDB readData = new CDB();
61-
int x = readData.count_Row("ProgramsData"); //Count the number of rows in the table
6260

63-
SqlCommand cmd;
64-
SqlDataReader dataReader;
65-
String sql = "";
66-
int number = 0;
61+
string sql = "Select * From ProgramsData";
6762

68-
sql = "Select * From ProgramsData";
69-
cmd = new SqlCommand(sql, readData._con());
70-
readData.open();
71-
72-
dataReader = cmd.ExecuteReader();
73-
ProgramPage[] listItems = new ProgramPage[x];
7463

75-
while (dataReader.Read())
64+
using (SqlConnection connection = new SqlConnection(@"Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|Database\Database2.mdf ;Integrated Security=True"))
7665
{
77-
listItems[number] = new ProgramPage();
78-
listItems[number].Title = dataReader["Name"].ToString();
79-
listItems[number].Install = dataReader["Url"].ToString();
80-
66+
int number = 0;
67+
CDB readData = new CDB();
8168

69+
int x = readData.count_Row("ProgramsData"); //Count the number of rows in the table
8270

83-
if (Programs_flowLayoutPanel.Controls.Count < 0)
71+
SqlCommand command = new SqlCommand(sql, connection);
72+
connection.Open();
73+
74+
SqlDataReader reader = command.ExecuteReader();
75+
ProgramPage[] listItems = new ProgramPage[x];
76+
77+
// Call Read before accessing data.
78+
while (reader.Read())
8479
{
85-
Programs_flowLayoutPanel.Controls.Clear();
86-
}
87-
else
88-
Programs_flowLayoutPanel.Controls.Add(listItems[number]);
80+
listItems[number] = new ProgramPage();
81+
listItems[number].Title = reader["Name"].ToString();
82+
listItems[number].Install = reader["Url"].ToString();
83+
listItems[number].Browse = reader["Browse"].ToString();
8984

90-
number++;
9185

9286

93-
}
94-
//get number of programs
95-
lab_numOFprograms.Text = "Programs: " + x.ToString() + " |";
87+
if (Programs_flowLayoutPanel.Controls.Count < 0)
88+
{
89+
Programs_flowLayoutPanel.Controls.Clear();
90+
}
91+
else
92+
Programs_flowLayoutPanel.Controls.Add(listItems[number]);
9693

97-
number = 0;
98-
dataReader.Close();
99-
readData.close();
94+
number++;
10095

101-
}
96+
}
97+
98+
// Call Close when done reading.
99+
reader.Close();
102100

101+
//get number of programs
102+
lab_numOFprograms.Text = "Programs: " + x.ToString() + " |";
103+
}
104+
105+
}
106+
107+
103108
//Fun for showing items on programs page by select type from database
104109
private void showItemType(String Type)
105110
{
@@ -119,12 +124,14 @@ private void showItemType(String Type)
119124

120125
dataReader = cmd.ExecuteReader();
121126
ProgramPage[] listItems = new ProgramPage[x];
122-
127+
123128
while (dataReader.Read())
124129
{
125130
listItems[number] = new ProgramPage();
126131
listItems[number].Title = dataReader["Name"].ToString();
127132
listItems[number].Install = dataReader["Url"].ToString();
133+
listItems[number].Browse = dataReader["Browse"].ToString();
134+
128135

129136

130137

@@ -139,7 +146,7 @@ private void showItemType(String Type)
139146

140147

141148
}
142-
149+
143150

144151

145152
number = 0;
@@ -150,59 +157,59 @@ private void showItemType(String Type)
150157
//Fun for adding items to Download page
151158
private void popuDownloadItems()
152159
{
153-
CDB readData = new CDB();
160+
string sql = "Select * From ProgramsData where CONVERT(VARCHAR,Status) not in ('New')";
154161

155-
//Count the number of rows in the table
156-
int x = readData.count_Row("ProgramsData" , " where CONVERT(VARCHAR,Status) not in ('New')");
162+
using (SqlConnection connection = new SqlConnection(@"Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|Database\Database2.mdf ;Integrated Security=True"))
163+
{
164+
int number = 0;
165+
CDB readData = new CDB();
166+
int x = readData.count_Row("ProgramsData", " where CONVERT(VARCHAR,Status) not in ('New')"); //Count the number of rows in the table
157167

168+
SqlCommand command = new SqlCommand(sql, connection);
169+
connection.Open();
158170

159-
SqlCommand cmd;
160-
SqlDataReader dataReader;
161-
String sql = "";
162-
int number = 0;
171+
SqlDataReader reader = command.ExecuteReader();
172+
DownloadList[] listItems = new DownloadList[x];
163173

164-
sql = "Select * From ProgramsData where CONVERT(VARCHAR,Status) not in ('New')";
165-
cmd = new SqlCommand(sql, readData._con());
166-
readData.open();
174+
// Call Read before accessing data.
175+
while (reader.Read())
176+
{
177+
//this fix while bug!
178+
if (x == number)
179+
break;
167180

168-
dataReader = cmd.ExecuteReader();
169-
DownloadList[] listItems = new DownloadList[x];
170-
171-
while (dataReader.Read())
172-
{
181+
listItems[number] = new DownloadList();
182+
listItems[number].Name = reader["Name"].ToString();
173183

174-
//this fix while bug!
175-
if (x == number)
176-
break;
184+
listItems[number].ProgramName = reader["Name"].ToString();
185+
listItems[number].Url = reader["Url"].ToString();
186+
//listItems[number].Icone = reader["Image"].ToString();
187+
177188

178-
listItems[number] = new DownloadList();
179189

180-
listItems[number].ProgramName = dataReader["Name"].ToString();
181-
listItems[number].Url = dataReader["Url"].ToString();
182-
//listItems[number].Icone = dataReader["Image"].ToString();
183-
listItems[number].Name = dataReader["Name"].ToString();
184190

185191

186192

193+
if (Downloads_flowLayoutPanel.Controls.Count < 0)
194+
{
195+
Downloads_flowLayoutPanel.Controls.Clear();
196+
}
197+
else
198+
Downloads_flowLayoutPanel.Controls.Add(listItems[number]);
199+
187200

201+
number++;
188202

189-
if (Downloads_flowLayoutPanel.Controls.Count < 0)
190-
{
191-
Downloads_flowLayoutPanel.Controls.Clear();
192203
}
193-
else
194-
Downloads_flowLayoutPanel.Controls.Add(listItems[number]);
195-
196204

197-
number++;
205+
// Call Close when done reading.
206+
reader.Close();
207+
}
208+
}
198209

199210

200-
}
201-
number = 0;
202-
dataReader.Close();
203-
readData.close();
204211

205-
}
212+
206213

207214
//Get Program page
208215
private void but_Programs_Click(object sender, EventArgs e)
@@ -268,6 +275,7 @@ private void tb_Search_TextChanged(object sender, EventArgs e)
268275
listItems[number] = new ProgramPage();
269276
listItems[number].Title = dataReader["Name"].ToString();
270277
listItems[number].Install = dataReader["Url"].ToString();
278+
listItems[number].Browse = dataReader["Browse"].ToString();
271279

272280

273281

@@ -332,6 +340,8 @@ private void Downloads_flowLayoutPanel_ControlRemoved(object sender, ControlEven
332340
//
333341
//address bar
334342
//
343+
344+
//Maximized
335345
private void button2_Click(object sender, EventArgs e)
336346
{
337347

@@ -348,15 +358,19 @@ private void button2_Click(object sender, EventArgs e)
348358
}
349359

350360
}
351-
352-
361+
//exit
353362
private void button1_Click_1(object sender, EventArgs e)
354363
{
355-
Environment.Exit(Environment.ExitCode);
356-
Application.ExitThread();
364+
365+
this.Close();
357366
Application.Exit();
358-
}
367+
Application.ExitThread();
368+
Environment.Exit(0);
369+
//Environment.Exit(Environment.ExitCode);
359370

371+
372+
}
373+
//Minimized
360374
private void button3_Click(object sender, EventArgs e)
361375
{
362376
WindowState = FormWindowState.Minimized;
@@ -383,7 +397,7 @@ private void panel1_MouseMove(object sender, MouseEventArgs e)
383397

384398

385399
//
386-
//programs button [Display type of programs]
400+
//programs filter bar [Display type of programs]
387401
//
388402

389403
//show [All]

0 commit comments

Comments
 (0)