Skip to content

Commit

Permalink
Persiapan rilis v1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@rudi-krsoftware
rudi-krsoftware committed Feb 13, 2018
1 parent ade749b commit f1d1345
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 85 deletions.
73 changes: 19 additions & 54 deletions src/OpenRetail.App/Pengaturan/FrmEntryOperator.Designer.cs
View file

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

2 changes: 0 additions & 2 deletions src/OpenRetail.App/Pengaturan/FrmEntryOperator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ public FrmEntryOperator(string header, Pengguna userOperator, IList<Role> listOf
LoadRole();

txtNama.Text = this._operator.nama_pengguna;
txtEmail.Text = this._operator.email.NullToString();

try
{
Expand Down Expand Up @@ -119,7 +118,6 @@ protected override void Simpan()
_operator = new Pengguna();

_operator.nama_pengguna = txtNama.Text;
_operator.email = txtEmail.Text;
_operator.pass_pengguna = txtPassword.Text;

if (txtKonfirmasiPassword.Text.Length > 0)
Expand Down
9 changes: 2 additions & 7 deletions src/OpenRetail.App/Pengaturan/FrmListOperator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ private void InitGridList()
var gridListProperties = new List<GridListControlProperties>();

gridListProperties.Add(new GridListControlProperties { Header = "No", Width = 30 });
gridListProperties.Add(new GridListControlProperties { Header = "Nama Operator", Width = 450 });
gridListProperties.Add(new GridListControlProperties { Header = "Email", Width = 300 });
gridListProperties.Add(new GridListControlProperties { Header = "Nama Operator", Width = 800 });
gridListProperties.Add(new GridListControlProperties { Header = "Role", Width = 300 });
gridListProperties.Add(new GridListControlProperties { Header = "Status Aktif" });

Expand Down Expand Up @@ -97,17 +96,13 @@ private void InitGridList()
break;

case 3:
e.Style.CellValue = userOperator.email;
break;

case 4:
var role = userOperator.Role;
if (role != null)
e.Style.CellValue = role.nama_role;

break;

case 5:
case 4:
e.Style.CellValue = userOperator.is_active ? "Aktif" : "Non Aktif";
e.Style.HorizontalAlignment = GridHorizontalAlignment.Center;
break;
Expand Down
24 changes: 15 additions & 9 deletions src/OpenRetail.Helper/DatabaseVersionHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,47 @@ public static class DatabaseVersionHelper
/// <summary>
/// Versi database yang terakhir
/// </summary>
public const int DatabaseVersion = 8;
public const int DatabaseVersion = 9;

/// <summary>
/// Script SQL untuk mengupgrade database v1 ke v2
/// </summary>
public const string UpgradeStrukturDatabase_v1_to_v2 = "db_v1_to_v2.sql";
private const string UpgradeStrukturDatabase_v1_to_v2 = "db_v1_to_v2.sql";

/// <summary>
/// Script SQL untuk mengupgrade database v2 ke v3
/// </summary>
public const string UpgradeStrukturDatabase_v2_to_v3 = "db_v2_to_v3.sql";
private const string UpgradeStrukturDatabase_v2_to_v3 = "db_v2_to_v3.sql";

/// <summary>
/// Script SQL untuk mengupgrade database v3 ke v4
/// </summary>
public const string UpgradeStrukturDatabase_v3_to_v4 = "db_v3_to_v4.sql";
private const string UpgradeStrukturDatabase_v3_to_v4 = "db_v3_to_v4.sql";

/// <summary>
/// Script SQL untuk mengupgrade database v4 ke v5
/// </summary>
public const string UpgradeStrukturDatabase_v4_to_v5 = "db_v4_to_v5.sql";
private const string UpgradeStrukturDatabase_v4_to_v5 = "db_v4_to_v5.sql";

/// <summary>
/// Script SQL untuk mengupgrade database v5 ke v6
/// </summary>
public const string UpgradeStrukturDatabase_v5_to_v6 = "db_v5_to_v6.sql";
private const string UpgradeStrukturDatabase_v5_to_v6 = "db_v5_to_v6.sql";

/// <summary>
/// Script SQL untuk mengupgrade database v6 ke v7
/// </summary>
public const string UpgradeStrukturDatabase_v6_to_v7 = "db_v6_to_v7.sql";
private const string UpgradeStrukturDatabase_v6_to_v7 = "db_v6_to_v7.sql";

/// <summary>
/// Script SQL untuk mengupgrade database v7 ke v8
/// </summary>
public const string UpgradeStrukturDatabase_v7_to_v8 = "db_v7_to_v8.sql";
private const string UpgradeStrukturDatabase_v7_to_v8 = "db_v7_to_v8.sql";

/// <summary>
/// Script SQL untuk mengupgrade database v8 ke v9
/// </summary>
private const string UpgradeStrukturDatabase_v8_to_v9 = "db_v8_to_v9.sql";

public static Dictionary<int, string> ListOfUpgradeDatabaseScript = new Dictionary<int, string>
{
Expand All @@ -73,7 +78,8 @@ public static class DatabaseVersionHelper
{ 5, DatabaseVersionHelper.UpgradeStrukturDatabase_v4_to_v5 },
{ 6, DatabaseVersionHelper.UpgradeStrukturDatabase_v5_to_v6 },
{ 7, DatabaseVersionHelper.UpgradeStrukturDatabase_v6_to_v7 },
{ 8, DatabaseVersionHelper.UpgradeStrukturDatabase_v7_to_v8 }
{ 8, DatabaseVersionHelper.UpgradeStrukturDatabase_v7_to_v8 },
{ 9, DatabaseVersionHelper.UpgradeStrukturDatabase_v8_to_v9 }
};
}
}
4 changes: 0 additions & 4 deletions src/OpenRetail.Model/Pengguna.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ public class Pengguna
[Display(Name = "Password")]
public string pass_pengguna { get; set; }

[Display(Name = "Email")]
public string email { get; set; }

[Write(false)]
[Display(Name = "Konfirmasi Password")]
public string konf_pass_pengguna { get; set; }
Expand Down Expand Up @@ -122,7 +119,6 @@ public PenggunaValidator()
RuleFor(c => c.nama_pengguna).NotEmpty().WithMessage(msgError1).Length(1, 50).WithMessage(msgError2);
RuleFor(c => c.pass_pengguna).NotEmpty().WithMessage(msgError1).Length(1, 32).WithMessage(msgError2);
RuleFor(c => c.konf_pass_pengguna).NotEmpty().WithMessage(msgError1).Length(1, 32).WithMessage(msgError2);
RuleFor(c => c.email).Length(0, 100).WithMessage(msgError2);
}
}
}
6 changes: 3 additions & 3 deletions src/OpenRetail.Repository.Service/PenggunaRepository.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace OpenRetail.Repository.Service
{
public class PenggunaRepository : IPenggunaRepository
{
private const string SQL_TEMPLATE = @"SELECT m_pengguna.pengguna_id, m_pengguna.nama_pengguna, m_pengguna.email, m_pengguna.pass_pengguna, m_pengguna.is_active, m_pengguna.status_user,
private const string SQL_TEMPLATE = @"SELECT m_pengguna.pengguna_id, m_pengguna.nama_pengguna, m_pengguna.pass_pengguna, m_pengguna.is_active, m_pengguna.status_user,
m_role.role_id, m_role.nama_role
FROM public.m_pengguna LEFT JOIN public.m_role ON m_pengguna.role_id = m_role.role_id
{WHERE}
Expand Down Expand Up @@ -159,13 +159,13 @@ public int Update(Pengguna obj)
// password sudah dienkripsi dari aplikasi
if (obj.pass_pengguna != null && obj.pass_pengguna.Length > 0)
{
_sql = @"UPDATE m_pengguna SET nama_pengguna = @nama_pengguna, email = @email, pass_pengguna = @pass_pengguna, role_id = @role_id, is_active = @is_active,
_sql = @"UPDATE m_pengguna SET nama_pengguna = @nama_pengguna, pass_pengguna = @pass_pengguna, role_id = @role_id, is_active = @is_active,
status_user = @status_user
WHERE pengguna_id = @pengguna_id";
}
else
{
_sql = @"UPDATE m_pengguna SET nama_pengguna = @nama_pengguna, email = @email, role_id = @role_id, is_active = @is_active, status_user = @status_user
_sql = @"UPDATE m_pengguna SET nama_pengguna = @nama_pengguna, role_id = @role_id, is_active = @is_active, status_user = @status_user
WHERE pengguna_id = @pengguna_id";
}

Expand Down
4 changes: 2 additions & 2 deletions src/VersionInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.3.0.30")]
[assembly: AssemblyFileVersion("1.3.0")]
[assembly: AssemblyVersion("1.4.0.30")]
[assembly: AssemblyFileVersion("1.4.0")]
4 changes: 2 additions & 2 deletions updater/open-retail-auto-updater.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.3.0.30</version>
<url>https://github.com/rudi-krsoftware/open-retail/releases/download/v1.3.0/AutoUpdater.exe</url>
<version>1.4.0.30</version>
<url>https://github.com/rudi-krsoftware/open-retail/releases/download/v1.4.0/AutoUpdater.exe</url>
</item>
4 changes: 2 additions & 2 deletions updater/open-retail-cashier-auto-updater.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.3.0.30</version>
<url>https://github.com/rudi-krsoftware/open-retail/releases/download/v1.3.0/AutoUpdaterCashier.exe</url>
<version>1.4.0.30</version>
<url>https://github.com/rudi-krsoftware/open-retail/releases/download/v1.4.0/AutoUpdaterCashier.exe</url>
</item>

0 comments on commit f1d1345

Please sign in to comment.