Skip to content

Commit

Permalink
Bug Fixes (Duplicate Opening Windows )
Browse files Browse the repository at this point in the history
  • Loading branch information
@lakshithaonline
lakshithaonline committed Jun 7, 2023
1 parent b98ac49 commit ccff330
Show file tree
Hide file tree
Showing 15 changed files with 1,194 additions and 16 deletions.
16 changes: 16 additions & 0 deletions EMS - SCNE/EMS - SCNE.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Startup.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Startup.Designer.cs">
<DependentUpon>Startup.cs</DependentUpon>
</Compile>
<Compile Include="UserControls - SuperAdmin\OverviewPanel_superadmin.cs">
<SubType>UserControl</SubType>
</Compile>
Expand Down Expand Up @@ -363,6 +369,9 @@
<DesignTime>True</DesignTime>
<DependentUpon>_EMS_SCNEDataSet.xsd</DependentUpon>
</Compile>
<EmbeddedResource Include="Startup.resx">
<DependentUpon>Startup.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControls - SuperAdmin\EmpContact_Information.resx">
<DependentUpon>EmpContact_Information.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -465,11 +474,18 @@
<None Include="Resources\mc-yellw.png" />
</ItemGroup>
<ItemGroup>
<Content Include="Resources\s1.jpg" />
<Content Include="Resources\Untitled-1.png" />
<Content Include="Resources\Untitled-2.png" />
<None Include="Resources\s11.jpg" />
<Content Include="Resources\s2.jpg" />
<None Include="Resources\logo.png" />
<None Include="Resources\user.png" />
<None Include="Resources\loginAttempts.txt.txt" />
<None Include="Resources\DefaultMaleImage.png" />
<None Include="Resources\DefaultFemaleImage.png" />
<None Include="Resources\290289867_2821437328151951_5817885558058486072_n.jpg" />
<Content Include="logo.png" />
<Content Include="logoSCNE.ico" />
<Content Include="Resources\construction-workers-sunset.jpg" />
<None Include="Resources\construction-workers-sunset1.jpg" />
Expand Down
8 changes: 4 additions & 4 deletions EMS - SCNE/Login.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ private void bunifuButton1_Click(object sender, EventArgs e)
if (bunifuDropdown1.SelectedIndex == 0 && username == "superadmin" && password == "123456")
{
// Open the SuperAdmin form
new SuperAdmin().ShowDialog();
Close();
new SuperAdmin().Show();
this.Hide();
}
else if (bunifuDropdown1.SelectedIndex == 1)
{
Expand All @@ -88,10 +88,10 @@ private void bunifuButton1_Click(object sender, EventArgs e)
{
// Open the Dashboard form
Dashboard dashboard = new Dashboard(username); //username variable send to the Dashboard form
dashboard.ShowDialog();
dashboard.Show();

// Close the Login form
Close();
this.Hide();
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion EMS - SCNE/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ static void Main()
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);

Application.Run(new Login());
Application.Run(new Startup());
//Application.Run(new SuperAdmin());

}
Expand Down
20 changes: 20 additions & 0 deletions EMS - SCNE/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 17 additions & 11 deletions EMS - SCNE/Properties/Resources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,31 +121,37 @@
<data name="construction-workers-sunset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\construction-workers-sunset1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mc-green" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mc-green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="mc-yellw" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mc-yellw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sign-error-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sign-error-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mc-yellw" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mc-yellw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="mc-green" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mc-green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mc-red" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mc-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="DefaultFemaleImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\DefaultFemaleImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="290289867_2821437328151951_5817885558058486072_n" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\290289867_2821437328151951_5817885558058486072_n.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DefaultFemaleImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\DefaultFemaleImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DefaultMaleImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\DefaultMaleImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="mc-red" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mc-red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="loginAttempts.txt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\loginAttempts.txt.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DefaultMaleImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\DefaultMaleImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="user" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="s1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\s11.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Binary file added EMS - SCNE/Resources/Untitled-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added EMS - SCNE/Resources/Untitled-2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added EMS - SCNE/Resources/logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added EMS - SCNE/Resources/s1.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added EMS - SCNE/Resources/s11.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added EMS - SCNE/Resources/s2.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ccff330

Please sign in to comment.