152 Commits

Author	SHA1	Message	Date
ngfrolov	9023aef984	Контроллер заглушка для суточного рапорта.	2022-04-19 12:14:03 +05:00
ngfrolov	5359beb9aa	doc	2022-04-14 16:07:29 +05:00
ngfrolov	fa9486e44d	grouping services and controllers	2022-04-11 18:00:34 +05:00
ngfrolov	80434475db	Add telemetryWireLine. ... Add InstantDataRepository	2022-04-11 17:22:52 +05:00
ngfrolov	c96bf87f17	Reorganize dtos	2022-04-08 13:10:06 +05:00
ngfrolov	24b0bc9d8c	Add WITS record tables	2022-04-01 17:55:44 +05:00
Фролов	8de73084f2	Add Mse to telemetryDataSaub	2022-03-10 17:18:30 +05:00
Фролов	b613cb5e1f	rename WellOperationDto.NptDays to NptHours	2022-03-10 17:17:52 +05:00
Фролов	3ebb0020f5	OperationsStatService add calc cumulative non productive time	2022-03-04 10:15:52 +05:00
Фролов	f286410eff	Add DrillingProgramCreateError	2022-02-28 14:44:15 +05:00
Фролов	cee68bf4ee	DrillingProgramStateDto Add PermissionToEdit	2022-02-24 09:52:11 +05:00
Фролов	29845aa36a	Add tests for DrillingProgramService	2022-02-21 17:55:50 +05:00
Фролов	e4e906c8d7	DrillingProgramService существенно переработан.	2022-02-12 11:28:16 +05:00
Фролов	4c68045398	Rename_DrillingProgram_FileCategories ... Add entity DrillingProgram parts	2022-02-09 14:25:22 +05:00
Фролов	f81dcf2a46	PermissionsMiddlware Add auto generate permissionsName	2022-01-13 17:08:07 +05:00
Фролов	f3803c0622	Add companyTypeId	2022-01-13 14:34:58 +05:00
Фролов	7487dfb342	Merge branch 'dev' into RefactorRoles	2022-01-12 17:50:21 +05:00
Фролов	9eb1070941	Add Day to TVD	2022-01-12 17:46:33 +05:00
Фролов	e09e358cd0	Add RelationUserRoleUserRole for multiple parents. INCOMPLETE	2022-01-12 16:33:53 +05:00
Фролов	2c51c352b1	CS2-139 Добавить контроллер AdminCompanyType	2022-01-12 13:33:16 +05:00
Фролов	90a0aa9e5b	Add TryGetTimezone methods. ... EnshureTimezonesIsSet() sets default timezone if can't find correct one. Edit WellDto to fix exception by constr: FK_t_well_t_well_type_id_well_type. Make IdWellType optional.	2022-01-10 17:39:33 +05:00
Фролов	345ca47f87	CS2-135. Db model uses DateTimeOffset. see about using DateTime[Offset].md	2022-01-05 17:50:45 +05:00
Фролов	4872b4a495	не доделано перед праздниками	2021-12-30 17:05:44 +05:00
Фролов	ecfdbfc394	Fix UserService.UpdateAsync() preserve users password.	2021-12-22 16:55:39 +05:00
Фролов	d40bced3a0	Merge branch 'dev' into RefactorWellService	2021-12-22 11:53:31 +05:00
Фролов	c5ed3c467f	fix and refactor WellService.	2021-12-22 11:41:18 +05:00
Харченко Владимир	1ec76e812f	CS2-99: Fixed well fact end date depending on well state	2021-12-21 16:36:28 +05:00
Фролов	6924a6bac7	start refactoring// fire alarm	2021-12-21 11:52:53 +05:00
Фролов	a0208f412e	refactor UserRoleService	2021-12-20 15:17:09 +05:00
Фролов	7c24d52fa2	Merge branch 'dev' into NewUserRoles	2021-12-20 15:13:36 +05:00
Фролов	5d45eb7289	Adapt RequestLogUserDto for frontend usage	2021-12-17 16:24:54 +05:00
Фролов	9bb1cc5abc	Add some fields into dtos to make possible assign telemetry to well.	2021-12-17 13:07:45 +05:00
Фролов	e0834e4720	add telemetry merge	2021-12-17 12:48:58 +05:00
Харченко Владимир	d94b2e685e	CS2-133: Fixed CRUD operations over Permissions	2021-12-17 12:38:34 +05:00
Харченко Владимир	17db1218cc	CS2-133: Removed permission mask logic from permissions	2021-12-16 16:00:47 +05:00
Харченко Владимир	888c28cdf8	CS2-133: Removed Value property from roles to permissions models and services	2021-12-15 16:21:52 +05:00
Фролов	551c60c4ff	Add/refactor services for permissions authorization model. ... Rename some fields in DB.permission.	2021-12-11 16:46:04 +05:00
Фролов	00dd39b587	merge dev to this	2021-12-03 09:58:48 +05:00
Фролов	06eb85e275	remove useless props "description" from ClusterDto, DepostDto	2021-12-02 09:53:30 +05:00
KharchenkoVladimir	22c5d33b7e	CS2-123: Added AdminPermissionController and Service	2021-12-01 17:10:17 +05:00
KharchenkoVladimir	cf517eabd5	CS2-123: Fixed role permissions create/update operations	2021-12-01 16:09:06 +05:00
KharchenkoVladimir	fd139079a4	CS2-123: Added [JsonIgnore] to UserRoleDto	2021-11-30 09:34:23 +05:00
KharchenkoVladimir	9280b28e10	CS2-123: Returned table for roles permissions.	2021-11-29 17:34:53 +05:00
KharchenkoVladimir	2d9388cb2a	Revert "CS2-123: Changed role permissions to bit collection" ... This reverts commit ad34e6445c.	2021-11-29 12:39:28 +05:00
KharchenkoVladimir	ad34e6445c	CS2-123: Changed role permissions to bit collection	2021-11-26 17:05:41 +05:00
Фролов	26ada6572b	Add SetpointInfoDto	2021-11-24 17:58:53 +05:00
KharchenkoVladimir	908c855463	CS2-123: Added CRUD over user roles and their permissions (controller + service)	2021-11-24 17:38:40 +05:00
Фролов	18ad9fc91a	CS2-124 Создать контроллер рекомендый новыйх уставок бурильщику	2021-11-24 16:16:17 +05:00
KharchenkoVladimir	872598dcdd	CS2-123: Added models for user roles and permissions. Fixed auth UserToken.	2021-11-24 11:30:29 +05:00
KharchenkoVladimir	cb52f96069	Merge branch 'dev' into MaxAndAverageRop ... # Conflicts: # AsbCloudInfrastructure/Services/WellService.cs	2021-11-23 11:35:11 +05:00