Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
192 commits
Select commit Hold shift + click to select a range
92f4721
Merge pull request #2 from demmy/Development
Oct 20, 2015
c1c4bf6
Merge pull request #3 from demmy/Development
Oct 22, 2015
8a785a4
Merge pull request #55 from vbre/workBranch
Oct 22, 2015
be5fa9a
Merge pull request #4 from demmy/Development
Oct 22, 2015
8599e6d
Merge pull request #5 from demmy/Development
Oct 22, 2015
f2bfffe
Merge from demmy/Development
Oct 22, 2015
694f7b0
On work
Oct 27, 2015
fe32181
Merge remote-tracking branch 'refs/remotes/demmy/Development' into cu…
Oct 27, 2015
e1640dc
Merge pull request #32 from demmy/Development
AlinaKulishdp Oct 29, 2015
8970585
Merge remote-tracking branch 'refs/remotes/demmy/Development'
SmolenskiyK Oct 29, 2015
54327c5
On wrok
Oct 29, 2015
90a0ffb
Merge remote-tracking branch 'refs/remotes/demmy/Development'
SmolenskiyK Oct 29, 2015
2850ac6
Merge remote-tracking branch 'refs/remotes/origin/master' into DevExF…
SmolenskiyK Oct 31, 2015
364ec81
implementation of add button
Oct 31, 2015
0f3025d
Merge pull request #33 from demmy/Development
AlinaKulishdp Oct 31, 2015
d7151bf
Merge branch 'master' into RolesView
Oct 31, 2015
04c6365
OnWork
Nov 1, 2015
1a3ca3a
Merge remote-tracking branch 'refs/remotes/demmy/Development'
Nov 1, 2015
73afe0c
Merge remote-tracking branch 'refs/remotes/origin/master' into curren…
Nov 1, 2015
19d27cc
Merge bugs fixed
Nov 1, 2015
94c66e8
save button
Nov 1, 2015
3be1f60
OnWork
Nov 1, 2015
10cdcc7
RoleView form was finished
Nov 1, 2015
e16cd87
Merge pull request #78 from vbre/currentBranch
demmy Nov 2, 2015
95077b8
remove database folder
demmy Nov 2, 2015
2e186aa
Merge pull request #34 from demmy/Development
AlinaKulishdp Nov 2, 2015
de14699
add base constructor
demmy Nov 2, 2015
ecfd9b3
manual merge
Nov 2, 2015
4c937a3
Merge pull request #77 from AlinaKulishdp/RolesView
demmy Nov 2, 2015
058b8d0
refactor password hash
demmy Nov 2, 2015
c310623
Merge remote-tracking branch 'refs/remotes/demmy/Development' into De…
SmolenskiyK Nov 2, 2015
6d88c92
Merge remote-tracking branch 'refs/remotes/demmy/Development'
SmolenskiyK Nov 2, 2015
1c098c8
Merge remote-tracking branch 'refs/remotes/demmy/Development' into De…
SmolenskiyK Nov 2, 2015
e6dd2be
Merge remote-tracking branch 'refs/remotes/demmy/Development' into De…
SmolenskiyK Nov 2, 2015
cb85b36
ProductCategoryView was added
Nov 2, 2015
aa3947b
Merge pull request #79 from AlinaKulishdp/RolesView
demmy Nov 2, 2015
c123d74
Deleted very old forms and add new forms
YaVanilko Nov 2, 2015
06c32b1
Order forms almost done
Nov 3, 2015
456bd80
Merge pull request #35 from demmy/Development
AlinaKulishdp Nov 3, 2015
70030da
Merge pull request #80 from YaVanilko/EFWorkingForms
demmy Nov 3, 2015
8be8dea
sql ce and annotation
demmy Nov 3, 2015
456a42b
remove Redistr
demmy Nov 3, 2015
4302360
bugs in ProductCategoryView were fixed
Nov 3, 2015
595fefb
add annotation
demmy Nov 3, 2015
c8e602d
message box was added before deactivation entities
Nov 3, 2015
0be6cb2
Merge pull request #36 from demmy/Development
AlinaKulishdp Nov 3, 2015
2242642
Merge branch 'master' into RolesView
Nov 3, 2015
b6e1e80
Merge pull request #81 from vbre/currentBranch
demmy Nov 3, 2015
b92b719
Merge remote-tracking branch 'refs/remotes/demmy/Development' into De…
SmolenskiyK Nov 3, 2015
600bc6f
add validation
Nov 3, 2015
cc86e87
Merge pull request #82 from AlinaKulishdp/RolesView
demmy Nov 3, 2015
4ef7874
Merge pull request #37 from demmy/Development
AlinaKulishdp Nov 3, 2015
4fb055d
Merge remote-tracking branch 'origin/Development' into SqlCE
demmy Nov 3, 2015
0c82600
migration
demmy Nov 3, 2015
acecc60
Merge branch 'SqlCE' into from_vbre
demmy Nov 3, 2015
8e39840
manual merge
demmy Nov 3, 2015
5b903d3
Merge pull request #84 from demmy/from_vbre
demmy Nov 3, 2015
e23d1bb
Merge pull request #39 from demmy/Development
AlinaKulishdp Nov 3, 2015
53da0f7
Merge remote-tracking branch 'refs/remotes/demmy/Development' into De…
SmolenskiyK Nov 3, 2015
f0319d7
Merge pull request #6 from demmy/Development
SmolenskiyK Nov 3, 2015
bfd6fb0
Merge remote-tracking branch 'refs/remotes/origin/master' into DevExF…
SmolenskiyK Nov 3, 2015
4e79ea9
Merge remote-tracking branch 'refs/remotes/demmy/Development' into cu…
Nov 3, 2015
da5bfa8
Merge fix and context added
Nov 3, 2015
b5d9927
Merge remote-tracking branch 'refs/remotes/demmy/Development' into cu…
Nov 3, 2015
8fc853d
add proxy for users and roles (user edit form)
Nov 3, 2015
38f787e
rename proxy to service
Nov 3, 2015
40a5605
addUser method added
Nov 3, 2015
972ff2b
Bugs fixed
Nov 3, 2015
cc29c54
password changing fix
Nov 3, 2015
9a3c6d4
Merge branch 'RolesView' of https://github.com/AlinaKulishdp/CS2_Proj…
SmolenskiyK Nov 4, 2015
5cbcfcc
fixes and refactoring
SmolenskiyK Nov 4, 2015
7f660be
add ctor without incoming parametres
SmolenskiyK Nov 4, 2015
7aca5bb
Merge pull request #86 from SmolenskiyK/DevExForms
demmy Nov 4, 2015
64462b4
add validation in RoleView
Nov 4, 2015
b22de9e
Merge pull request #40 from demmy/Development
AlinaKulishdp Nov 4, 2015
5013736
Merge branch 'master' into RolesView
Nov 4, 2015
0fa4ae0
new version
Nov 4, 2015
ebd9f09
bug fix
Nov 4, 2015
6db7fd0
Merge remote-tracking branch 'refs/remotes/demmy/Development' into cu…
Nov 4, 2015
51c3975
empty fields
SmolenskiyK Nov 4, 2015
c26a639
add validation into user edit
SmolenskiyK Nov 5, 2015
59fc760
Add service and fixing some bugs
YaVanilko Nov 5, 2015
bd0fc38
Activation + Price fixed
Nov 5, 2015
acfa5da
Merge pull request #89 from SmolenskiyK/DevExForms
demmy Nov 5, 2015
6c4cf66
Merge pull request #91 from YaVanilko/Refactoring
demmy Nov 5, 2015
5c3e652
Merge branch 'currentBranch' of https://github.com/vbre/CS2_Project i…
demmy Nov 5, 2015
6e09b36
fix encoding
demmy Nov 5, 2015
555626b
fix names
demmy Nov 5, 2015
2e2c62c
code refactoring in RoleView
Nov 5, 2015
3a48691
code refactoring in ProductCategoryView
Nov 5, 2015
20944c4
validation bug fix, unsaved changes dialog
SmolenskiyK Nov 5, 2015
3e6b8a6
dialog result yes
SmolenskiyK Nov 5, 2015
c9bc94a
true fix
SmolenskiyK Nov 5, 2015
7fae03c
some little things
Nov 5, 2015
66e7940
add condition
SmolenskiyK Nov 5, 2015
32b48ec
adjust columns size
Nov 5, 2015
67208c0
Merge pull request #87 from AlinaKulishdp/RolesView
demmy Nov 5, 2015
586127d
Merge pull request #96 from SmolenskiyK/DevExForms
demmy Nov 5, 2015
d9a71ca
Merge pull request #41 from demmy/Development
AlinaKulishdp Nov 5, 2015
4f7a6e1
bug fixes
SmolenskiyK Nov 5, 2015
f93fcdc
role validation fix
SmolenskiyK Nov 5, 2015
fe7a262
cancel click closing fix
SmolenskiyK Nov 5, 2015
6ca804e
add dummy data to seed
demmy Nov 5, 2015
0b4f8e7
fix good access modifier
demmy Nov 5, 2015
f5e2302
Merge pull request #100 from demmy/vbre_merge
demmy Nov 5, 2015
9264fa6
Merge remote-tracking branch 'refs/remotes/demmy/Development' into cu…
Nov 5, 2015
9c8fe55
view changes
SmolenskiyK Nov 5, 2015
6225bd3
Merge remote-tracking branch 'refs/remotes/demmy/Development'
SmolenskiyK Nov 5, 2015
b4eb3fc
add user in main view caption
SmolenskiyK Nov 5, 2015
17c89ce
refactor Customer
demmy Nov 5, 2015
8e1681e
Validation was added in CustomerView
Nov 5, 2015
66db649
Merge pull request #42 from demmy/Development
AlinaKulishdp Nov 5, 2015
0ce3e3d
Merge remote-tracking branch 'refs/remotes/demmy/vbre_merge' into cur…
Nov 5, 2015
91db87f
Comboboxs seted as redonly
Nov 5, 2015
109caef
Merge branch 'master' into Customer-refactoring
Nov 5, 2015
50dbf73
Merge pull request #99 from SmolenskiyK/DevExForms
demmy Nov 6, 2015
c567907
Merge pull request #101 from SmolenskiyK/mainFormEdit
demmy Nov 6, 2015
c536fbf
Merge pull request #102 from AlinaKulishdp/Customer-refactoring
demmy Nov 6, 2015
c26d79a
refactor DAO
demmy Nov 6, 2015
865330b
remove detached context
demmy Nov 6, 2015
2bda4db
Merge remote-tracking branch 'refs/remotes/demmy/Development' into Re…
SmolenskiyK Nov 6, 2015
6d55583
refactoring and fixing
SmolenskiyK Nov 6, 2015
84a6679
Merge pull request #103 from SmolenskiyK/Refactoring
demmy Nov 6, 2015
20b80e1
Merge pull request #104 from demmy/repository_change
demmy Nov 6, 2015
cba529d
Merge remote-tracking branch 'refs/remotes/demmy/Development' into Re…
SmolenskiyK Nov 6, 2015
e59731b
auth refactoring
SmolenskiyK Nov 6, 2015
2b4ed35
remove cancel
SmolenskiyK Nov 6, 2015
d091d1b
Cosmetic changes
Nov 8, 2015
c771334
Merge remote-tracking branch 'refs/remotes/demmy/Development' into cu…
Nov 8, 2015
60e99b2
Merge pull request #43 from demmy/Development
AlinaKulishdp Nov 8, 2015
a18db66
Bug fix in CustomerView
Nov 8, 2015
a527b44
Merge pull request #106 from AlinaKulishdp/Customer-refactoring
demmy Nov 8, 2015
6ca3770
Bug fixing
Nov 8, 2015
4f951be
Merge pull request #107 from vbre/currentBranch
demmy Nov 8, 2015
8924149
empty password bug fix
SmolenskiyK Nov 9, 2015
52f7478
Merge remote-tracking branch 'refs/remotes/demmy/Development' into Re…
SmolenskiyK Nov 9, 2015
e0038d9
add notifyManager
SmolenskiyK Nov 9, 2015
f7f7019
Merge pull request #44 from demmy/Development
AlinaKulishdp Nov 9, 2015
6511bb6
Merge pull request #105 from SmolenskiyK/Refactoring
demmy Nov 9, 2015
e43809b
Merge pull request #45 from demmy/Development
AlinaKulishdp Nov 9, 2015
bae8d03
Merge branch 'Refactoring' of https://github.com/YaVanilko/CS2_Projec…
demmy Nov 9, 2015
46f6a72
GoodsDao refactor
demmy Nov 9, 2015
73e7e66
Cosmetic changes
Nov 9, 2015
4552a56
add event in CustomerDetailView
Nov 9, 2015
46df66f
fix AddGoods
demmy Nov 9, 2015
88ff759
Merge pull request #109 from demmy/elena_merge
demmy Nov 9, 2015
e95aa1d
Merge pull request #108 from AlinaKulishdp/Customer-refactoring
demmy Nov 9, 2015
0fb11ea
remove dummy Seed
demmy Nov 9, 2015
02798de
Merge pull request #46 from demmy/Development
AlinaKulishdp Nov 9, 2015
b02a36e
Merge pull request #7 from demmy/Development
Nov 9, 2015
1f20214
Merge remote-tracking branch 'refs/remotes/demmy/Development' into cu…
Nov 9, 2015
0cbca55
Merge branch 'currentBranch' of https://github.com/vbre/CS2_Project i…
Nov 9, 2015
5af4ecb
fix category duplication
demmy Nov 9, 2015
1983c25
Merge pull request #47 from demmy/Development
AlinaKulishdp Nov 9, 2015
dbeec5a
Merge pull request #8 from demmy/Development
Nov 9, 2015
e9baff5
Merge remote-tracking branch 'refs/remotes/demmy/Development' into Co…
YaVanilko Nov 9, 2015
d2c200a
aasa
demmy Nov 9, 2015
bd6850a
IsActive edit
YaVanilko Nov 9, 2015
6559ef7
Merge pull request #9 from demmy/vbre_add_order
Nov 9, 2015
a2917a6
Merge pull request #114 from YaVanilko/ContosoProject
demmy Nov 9, 2015
a615098
Merge remote-tracking branch 'refs/remotes/demmy/Development' into cu…
Nov 9, 2015
49ce81d
comments removed
Nov 9, 2015
c510597
Refactoring
Nov 9, 2015
4922a8d
Validation and Message dialog
Nov 9, 2015
a26fe7c
If category is empty, form doesn't fall
YaVanilko Nov 9, 2015
395af04
Hard refactoring
Nov 9, 2015
dbaab68
Bug fixing
Nov 9, 2015
aab71b3
Bud fixing + refactoring
Nov 10, 2015
4c18fbf
Merge pull request #115 from AlinaKulishdp/Finish
demmy Nov 10, 2015
eb6bef9
Merge pull request #116 from YaVanilko/ContosoProject
demmy Nov 10, 2015
454197f
Merge remote-tracking branch 'refs/remotes/origin/Development' into v…
Nov 10, 2015
1f8508a
Merge remote-tracking branch 'refs/remotes/origin/vbre_add_order' int…
Nov 10, 2015
3fb644c
Merge branch 'Development' of https://github.com/demmy/CS2_Project in…
demmy Nov 10, 2015
140806e
Merge pull request #119 from demmy/vbre_currentBranch
demmy Nov 10, 2015
79892bb
Merge pull request #48 from demmy/Development
AlinaKulishdp Nov 10, 2015
dcbb6f9
Bug with orders' list fixed
Nov 10, 2015
d5a7ac8
Fixing bugs
Nov 10, 2015
18b5a85
Merge remote-tracking branch 'refs/remotes/demmy/Development' into cu…
Nov 10, 2015
05e3e92
Merge pull request #120 from vbre/currentBranch
demmy Nov 10, 2015
c9041f6
Merge pull request #121 from AlinaKulishdp/Finish
demmy Nov 10, 2015
5226603
Final changes
YaVanilko Nov 10, 2015
109f933
Merge pull request #122 from YaVanilko/Final
demmy Nov 10, 2015
244de7f
Merge pull request #49 from demmy/Development
AlinaKulishdp Nov 10, 2015
239e860
add image to authentication form
Nov 11, 2015
972610f
Merge pull request #123 from AlinaKulishdp/Finish
demmy Nov 11, 2015
b71efc0
dx fix
demmy Nov 24, 2015
22515db
remove Comments
demmy Nov 24, 2015
a1a5223
remove Comments
demmy Nov 24, 2015
37f82c8
del cm
demmy Nov 24, 2015
8326207
del Comments
demmy Nov 24, 2015
c18555b
compacted
demmy Nov 24, 2015
a2f21a5
tst
demmy Nov 24, 2015
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
2 changes: 0 additions & 2 deletions Redistribute/README.md

This file was deleted.

Binary file removed Redistribute/SqlLocalDBx32.msi
Binary file not shown.
Binary file removed Redistribute/SqlLocalDBx64.msi
Binary file not shown.
20 changes: 17 additions & 3 deletions Solution/ContosoProject/ContosoUI/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,31 @@
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
</configSections>
<connectionStrings>
<add name="ContosoContext" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=ContosoDB;Integrated Security=SSPI;" providerName="System.Data.SqlClient"/>
</connectionStrings>
<add name="ContosoCEContext"
connectionString="Data source=|DataDirectory|ContosoCS2.sdf;"
providerName="System.Data.SqlServerCe.4.0"/>
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework">
<parameters>
<parameter value="System.Data.SqlServerCe.4.0" />
</parameters>
</defaultConnectionFactory>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
<provider invariantName="System.Data.SqlServerCe.4.0" type="System.Data.Entity.SqlServerCompact.SqlCeProviderServices, EntityFramework.SqlServerCompact" />
</providers>
</entityFramework>
<system.data>
<DbProviderFactories>
<remove invariant="System.Data.SqlServerCe.4.0" />
<add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
</DbProviderFactories>
</system.data>
</configuration>

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

Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ namespace ContosoUI.Authentication
public partial class AuthenticationForm : DevExpress.XtraEditors.XtraForm
{
public event EventHandler OkButtonClick = null;
public AuthenticationPresenter presenter = null;

AuthenticationPresenter presenter = null;
public AuthenticationPresenter Presenter { get { return this.presenter; } }
public string Login { get { return LoginTextEdit.Text; } }
public string Password { get { return PasswordEdit.Text; } }

Expand Down Expand Up @@ -64,5 +64,15 @@ public void FieldsReset()
PasswordReset();
LoginTextEdit.Text = String.Empty;
}

internal void UserIsNotActiveDialog()
{
MessageBox.Show("Извините, данный аккаунт не активен.", "Ошибка!");
}

internal void AccessDenyDialog()
{
MessageBox.Show("Неверный логин и/или пароль", "Ошибка!");
}
}
}
Loading