eegov/DepartmentProject
1
1
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

поля не null в атрибуте

Browse Source
This commit is contained in:
kotcheshir73 2021-04-03 11:38:27 +04:00
parent 0012615e11
commit 908c920d26
9 changed files with 41 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDateTime.cs
View File

@ -19,7 +19,7 @@ namespace DesktopTools.BaseControls
/// <param name="minDate"></param>
/// <param name="maxDate"></param>
/// <param name="customDateFormat"></param>
public BaseControlDateTime(string propertyName, bool mustFilling, bool readOnly, DateTime? minDate, DateTime? maxDate, string customDateFormat) : base(propertyName, mustFilling, readOnly)
public BaseControlDateTime(string propertyName, bool mustFilling, bool readOnly, DateTime minDate, DateTime maxDate, string customDateFormat) : base(propertyName, mustFilling, readOnly)
{
InitializeComponent();
_baseControl = this;
@ -35,13 +35,13 @@ namespace DesktopTools.BaseControls
}
dateTimePicker.ValueChanged += (object sender, EventArgs e) => { CallOnValueChangeEvent(); };
if (minDate.HasValue)
if (minDate > DateTime.MinValue)
{
dateTimePicker.MinDate = minDate.Value;
dateTimePicker.MinDate = minDate;
}
if (maxDate.HasValue)
if (maxDate > DateTime.MinValue)
{
dateTimePicker.MaxDate = maxDate.Value;
dateTimePicker.MaxDate = maxDate;
}
if(customDateFormat.IsNotEmpty())
{

14
DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlDecimal.cs
View File

@ -18,7 +18,7 @@ namespace DesktopTools.BaseControls
/// <param name="minValue"></param>
/// <param name="maxValue"></param>
/// <param name="decimalPlaces"></param>
public BaseControlDecimal(string propertyName, bool mustFilling, bool readOnly, decimal? minValue, decimal? maxValue, int? decimalPlaces) : base(propertyName, mustFilling, readOnly)
public BaseControlDecimal(string propertyName, bool mustFilling, bool readOnly, decimal minValue, decimal maxValue, int decimalPlaces) : base(propertyName, mustFilling, readOnly)
{
InitializeComponent();
_baseControl = this;
@ -34,17 +34,17 @@ namespace DesktopTools.BaseControls
}
numericUpDown.ValueChanged += (object sender, EventArgs e) => { CallOnValueChangeEvent(); };
if (minValue.HasValue)
if (minValue != 0)
{
numericUpDown.Minimum = minValue.Value;
numericUpDown.Minimum = minValue;
}
if (maxValue.HasValue)
if (maxValue != 0)
{
numericUpDown.Maximum = maxValue.Value;
numericUpDown.Maximum = maxValue;
}
if (decimalPlaces.HasValue)
if (decimalPlaces != 0)
{
numericUpDown.DecimalPlaces = decimalPlaces.Value;
numericUpDown.DecimalPlaces = decimalPlaces;
}
panelControl.Controls.Add(numericUpDown);
}

10
DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlImage.cs
View File

@ -19,18 +19,18 @@ namespace DesktopTools.BaseControls
/// <param name="readOnly"></param>
/// <param name="width"></param>
/// <param name="height"></param>
public BaseControlImage(string propertyName, bool mustFilling, bool readOnly, int? width, int? height) : base(propertyName, mustFilling, readOnly)
public BaseControlImage(string propertyName, bool mustFilling, bool readOnly, int width, int height) : base(propertyName, mustFilling, readOnly)
{
InitializeComponent();
_baseControl = this;
if (width.HasValue)
if (width != 0)
{
Width = width.Value;
Width = width;
}
if (height.HasValue)
if (height != 0)
{
Height = height.Value;
Height = height;
}
buttonLoad.Click += (object sender, EventArgs e) =>

10
DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlInt.cs
View File

@ -17,7 +17,7 @@ namespace DesktopTools.BaseControls
/// <param name="readOnly"></param>
/// <param name="minValue"></param>
/// <param name="maxValue"></param>
public BaseControlInt(string propertyName, bool mustFilling, bool readOnly, decimal? minValue, decimal? maxValue) : base(propertyName, mustFilling, readOnly)
public BaseControlInt(string propertyName, bool mustFilling, bool readOnly, decimal minValue, decimal maxValue) : base(propertyName, mustFilling, readOnly)
{
InitializeComponent();
_baseControl = this;
@ -33,13 +33,13 @@ namespace DesktopTools.BaseControls
}
numericUpDown.ValueChanged += (object sender, EventArgs e) => { CallOnValueChangeEvent(); };
if (minValue.HasValue)
if (minValue != 0)
{
numericUpDown.Minimum = minValue.Value;
numericUpDown.Minimum = minValue;
}
if (maxValue.HasValue)
if (maxValue != 0)
{
numericUpDown.Maximum = maxValue.Value;
numericUpDown.Maximum = maxValue;
}
panelControl.Controls.Add(numericUpDown);
}

6
DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlString.cs
View File

@ -17,14 +17,14 @@ namespace DesktopTools.BaseControls
/// <param name="mustFilling"></param>
/// <param name="readOnly"></param>
/// <param name="maxLength"></param>
public BaseControlString(string propertyName, bool mustFilling, bool readOnly, int? maxLength) : base(propertyName, mustFilling, readOnly)
public BaseControlString(string propertyName, bool mustFilling, bool readOnly, int maxLength) : base(propertyName, mustFilling, readOnly)
{
InitializeComponent();
_baseControl = this;
if (maxLength.HasValue)
if (maxLength != 0)
{
textBox.MaxLength = maxLength.Value;
textBox.MaxLength = maxLength;
}
textBox.TextChanged += (object sender, EventArgs e) => { CallOnValueChangeEvent(); };
panelControl.Controls.Add(textBox);

12
DepartmentPortal/Common/DesktopTools/BaseControls/BaseControlText.cs
View File

@ -18,19 +18,19 @@ namespace DesktopTools.BaseControls
/// <param name="readOnly"></param>
/// <param name="maxLength"></param>
/// <param name="height"></param>
public BaseControlText(string propertyName, bool mustFilling, bool readOnly, int? maxLength, int? height) : base(propertyName, mustFilling, readOnly)
public BaseControlText(string propertyName, bool mustFilling, bool readOnly, int maxLength, int height) : base(propertyName, mustFilling, readOnly)
{
InitializeComponent();
_baseControl = this;
if (maxLength.HasValue)
if (maxLength != 0)
{
textBox.MaxLength = maxLength.Value;
textBox.MaxLength = maxLength;
}
if (height.HasValue)
if (height != 0)
{
textBox.Height = height.Value;
Height = height.Value;
textBox.Height = height;
Height = height;
}
textBox.TextChanged += (object sender, EventArgs e) => { CallOnValueChangeEvent(); };
panelControl.Controls.Add(textBox);

31
DepartmentPortal/Common/ModuleTools/Attributes/ViewModelControlElementPropertyAttribute.cs
View File

@ -33,42 +33,42 @@ namespace ModuleTools.Attributes
/// <summary>
/// Ширина
/// </summary>
public int? Width { get; set; } = null;
public int Width { get; set; } = 0;
/// <summary>
/// Высота
/// </summary>
public int? Height { get; set; } = null;
public int Height { get; set; } = 0;
/// <summary>
/// Максимальное длина строки
/// </summary>
public int? MaxLength { get; set; } = null;
public int MaxLength { get; set; } = 0;
/// <summary>
/// Минимальное значение для числового параметра
/// </summary>
public decimal? MinValue { get; set; } = null;
public decimal MinValue { get; set; } = 0;
/// <summary>
/// Максимальное значение для числового параметра
/// </summary>
public decimal? MaxValue { get; set; } = null;
public decimal MaxValue { get; set; } = 0;
/// <summary>
/// Количество знаков после запятой
/// </summary>
public int? DecimalPlaces { get; set; } = null;
public int DecimalPlaces { get; set; } = 0;
/// <summary>
/// Минимальное значение для даты
/// </summary>
public DateTime? MinDate { get; set; } = null;
public DateTime MinDate { get; set; } = DateTime.MinValue;
/// <summary>
/// Максимальное значение для даты
/// </summary>
public DateTime? MaxDate { get; set; } = null;
public DateTime MaxDate { get; set; } = DateTime.MinValue;
/// <summary>
/// Пользовательский формат отображения даты
@ -90,20 +90,5 @@ namespace ModuleTools.Attributes
DisplayName = displayName;
ControlType = controlType;
}
/// <summary>
/// Конструктор
/// </summary>
/// <param name="displayName">Название на форме</param>
/// <param name="controlType">Через какой тип контрола отображать свойство</param>
/// <param name="width">Ширина</param>
/// <param name="height">Высота</param>
public ViewModelControlElementPropertyAttribute(string displayName, ControlType controlType, int width, int height)
{
DisplayName = displayName;
ControlType = controlType;
Width = width;
Height = height;
}
}
}

2
DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/EnviromentSettingViewModels.cs
View File

@ -26,7 +26,7 @@ namespace SecurityBusinessLogic.ViewModels
public string Value { get; set; }
[ViewModelControlListProperty("Описание")]
[ViewModelControlElementProperty("Описание", ControlType.ControlText, 0, 200)]
[ViewModelControlElementProperty("Описание", ControlType.ControlText, Height = 200)]
[MapConfiguration("Description", AllowCopyWithoutRigth = false)]
public string Description { get; set; }

2
DepartmentPortal/Security/SecurityBusinessLogic/ViewModels/UserViewModels.cs
View File

@ -27,7 +27,7 @@ namespace SecurityBusinessLogic.ViewModels
public string Password { get; set; }
[MapConfiguration("Avatar")]
[ViewModelControlElementProperty("Фото", ControlType.ControlImage, 200, 200)]
[ViewModelControlElementProperty("Фото", ControlType.ControlImage, Width = 200, Height = 200)]
public byte[] Avatar { get; set; }
[ViewModelControlListProperty("Посл. визит", 100)]