Commit Graph

216 Commits

Author SHA1 Message Date
562392c644
Merge pull request #107 from apuc/update_projects_and_tasks
Update projects and tasks
2023-03-16 17:32:26 +03:00
iIronside
f5e69511fb add status to login method 2023-02-21 23:08:46 +03:00
iIronside
06cfa93adf add status to login method 2023-02-21 21:22:12 +03:00
iIronside
f2c77fb72c add methods to project task category 2023-01-25 11:50:07 +03:00
iIronside
a353cbec6c Merge branch 'master' into update_projects_and_tasks 2023-01-25 10:38:17 +03:00
iIronside
78aaef28df add api for project 2023-01-24 17:32:46 +03:00
iIronside
3ac2d54ec2 fix actionReportsByDate 2023-01-19 17:16:43 +03:00
iIronside
3e236c5869 check commit 2023-01-19 17:08:16 +03:00
iIronside
9b46ec36dd fix reports 2023-01-19 16:48:49 +03:00
iIronside
c0399b30b0 fix reports 2023-01-19 16:45:21 +03:00
iIronside
56ec8d8b13 fix reports 2023-01-19 16:40:01 +03:00
iIronside
2f8e6466f4 fix reports 2023-01-19 16:35:26 +03:00
iIronside
bb9959edf1 fix reports 2023-01-19 16:29:22 +03:00
iIronside
b5a9d4be40 tmp commit 2023-01-19 14:50:55 +03:00
iIronside
097ecfe087 fix actionFindByDate in ReportsController 2023-01-19 14:30:49 +03:00
iIronside
bbc11fc559 fix actionFindByDate in ReportsController 2023-01-19 13:55:28 +03:00
iIronside
8b2bb7468c rename task to project task, task_user to project_task_user, fix behavior 2023-01-18 15:30:38 +03:00
iIronside
55f412c8eb fix CORSE add Access-Control-Allow-Origin to Headers 2023-01-13 15:46:15 +03:00
iIronside
1394e89d45 fix return header in api controller 2023-01-12 16:12:48 +03:00
iIronside
f08cc3b7fa fix change header in api controller 2023-01-12 16:00:07 +03:00
iIronside
18ca568485 fix findByDate in ReportSearchForm 2023-01-10 17:45:53 +03:00
iIronside
87d936a207 Merge branch 'master' into portfolio 2022-12-27 11:45:48 +03:00
iIronside
74214f090e add portfolio projects 2022-12-27 11:45:28 +03:00
iIronside
56dbef433d fix user login 2022-12-26 15:23:46 +03:00
iIronside
aea2c52124 update get profile method in api 2022-12-23 17:42:35 +03:00
iIronside
9104b870a7 update login method in api 2022-12-23 17:40:43 +03:00
iIronside
e0366b9d8c add find reports by date to api 2022-12-20 19:24:38 +03:00
iIronside
b6d958bdc0 fix add report 2022-12-16 20:18:25 +03:00
iIronside
ac03d43a40 fix add report 2022-12-16 18:54:13 +03:00
iIronside
f41b1615a5 rollback actionIndex in ProfileController 2022-10-19 15:42:26 +03:00
iIronside
6385787702 fix questionnaire and profile errors format 2022-10-19 15:28:09 +03:00
iironside
16db7b42d9 the method was moved UserCard to Profile 2022-03-21 19:08:39 +03:00
iironside
7a5a41cd14 some refactor 2022-03-21 14:57:15 +03:00
iironside
e00f2b84ea refactoring InterviewRequest, Profile 2022-03-21 14:56:21 +03:00
iironside
55089accb5 added get-points-number, get-question-number methods, update status in UserQuestionnaire, some refactoring 2022-03-17 14:50:57 +03:00
iironside
18d2b4327d refactor api/UserQuestionnaire 2022-03-15 17:56:45 +03:00
iironside
a5ef1d5008 refactor api/UserResponse 2022-03-15 16:54:34 +03:00
iironside
675d78b958 move ScoreCalculator fom helpers to services 2022-03-15 14:54:35 +03:00
iironside
ade80dc859 Merge branch 'master' into update_user_answers
# Conflicts:
#	frontend-access.log
#	frontend-error.log
2022-03-15 12:58:15 +03:00
iironside
745c53ed39 added questionnaire completed method 2022-03-14 17:47:01 +03:00
iironside
c99aac589d Merge branch 'master' into add_document
# Conflicts:
#	frontend-access.log
#	frontend-error.log
2022-03-14 14:34:11 +03:00
iironside
60ad6c0e00 added user response verification before saving 2022-03-14 13:06:20 +03:00
iironside
b053a429a3 in UserResponseController extends ApiController 2022-03-11 14:37:44 +03:00
iironside
ba96ae3119 Merge branch 'master' into add_document 2022-03-07 11:08:08 +03:00
andrey
daee4e3e68 fix 2022-03-03 17:24:45 +03:00
iIronside
e410a59c16 add method to fin reports by date 2022-02-15 12:42:56 +03:00
iIronside
40853b6167 add title and testing_date to user_questionnaire 2022-02-15 11:29:16 +03:00
iIronside
d126d8323f added services, added documentation 2022-01-16 23:54:13 +03:00
4cbb004c4d
Merge pull request #86 from apuc/add_document
update get-template-list method
2022-01-14 18:00:05 +03:00
iIronside
495eb9a1a4 update get-template-list method 2022-01-14 17:34:11 +03:00
andrey
8806be42b2 fix api controllers 2022-01-14 17:05:29 +03:00
iIronside
e09f38f24b actionProfileWithReportPermission 2022-01-14 12:56:39 +03:00
iIronside
b123d250e1 in api added methods: document created and get profile with reports permission 2022-01-14 10:09:02 +03:00
iIronside
920aa2e751 add some api method 2022-01-11 14:49:32 +03:00
iIronside
13a9bdcca0 add some api method 2022-01-11 13:37:30 +03:00
iIronside
9c07e81fab Merge branch 'api_update_login_method' into add_document 2022-01-11 09:54:06 +03:00
iIronside
77b5db56b7 add migration, fix delete tmp document, update extend controllers i api 2022-01-11 00:20:54 +03:00
iIronside
faed561f9c api added id in response to login 2022-01-07 15:14:46 +03:00
iIronside
18b7fb0765 update api for manager 2022-01-05 17:44:13 +03:00
iIronside
dccf3c012e Add documents to template 2022-01-05 16:14:38 +03:00
andrey
243d7ae4c0 Merge branch 'master' of https://github.com/apuc/guild 2021-12-11 15:54:37 +03:00
anatolidew
5c80f72ee5 Переместил резюме 2021-12-10 15:29:07 +03:00
andrey
2f565bd97a Merge branch 'master' of https://github.com/apuc/guild 2021-12-06 17:07:37 +03:00
andrey
25377d272d report by date 2021-12-06 17:07:27 +03:00
afe743a6f3
Merge pull request #76 from apuc/add_task
changed the creator for tasks from project_user to user, fixed api, d…
2021-12-06 17:06:46 +03:00
iIronside
e78ff7d779 changed the creator for tasks from project_user to user, fixed api, documentation, filters, some other fixes 2021-12-06 15:13:31 +03:00
andrey
31c35676f3 profile search fix 2021-11-30 17:18:07 +03:00
andrey
941a3964c6 profile and reports fix 2021-11-30 16:54:04 +03:00
andrey
df5823730f Merge branch 'master' of https://github.com/apuc/guild 2021-11-29 18:22:02 +03:00
andrey
57cb9df4bf api cors 2021-11-29 18:21:50 +03:00
402e1863e4
Merge pull request #74 from q6q9/api-reports
Api reports
2021-11-29 18:21:04 +03:00
anatolidew
d00c93d4be * Убрал лишнее 2021-11-29 18:17:23 +03:00
anatolidew
8ae7b9a125 * Просмотр 1 репорта
* Создание тасков
2021-11-29 18:16:28 +03:00
53514bee94
Merge pull request #72 from q6q9/changes
add resume & fix bag minutes
2021-11-29 13:53:26 +03:00
e405b790fd
Merge pull request #73 from q6q9/ru-datepicker
русский датапикер
2021-11-29 13:50:54 +03:00
anatolidew
e742c582bc русский датапикер 2021-11-29 13:22:25 +03:00
anatolidew
8400da1033 * убрал лишнее 2021-11-25 14:19:38 +03:00
anatolidew
c4139baeb2 * баг с минутами
* добавлено редактирование портфолио
2021-11-25 14:04:14 +03:00
dc3db9e68a
Merge pull request #70 from apuc/add_task
Add task
2021-11-25 13:02:08 +03:00
iIronside
9e964222ae add api, docs 2021-11-25 12:33:08 +03:00
andrey
8e490ce518 Merge branch 'add_minutes' of https://github.com/q6q9/guild into add_minutes 2021-11-23 16:16:09 +03:00
anatolidew
28294fc8ca * убрал лишнее 2021-11-23 11:01:35 +03:00
anatolidew
45fcfe16d1 * добавил минуты
* исправил баг в календаре с 12 месяцем ('yyyy-00-dd' => 'yyyy-12-dd')
2021-11-23 10:55:41 +03:00
iIronside
957e777da5 merge 2021-11-17 16:45:52 +03:00
iIronside
1c50b5f579 add manager api 2021-11-17 12:24:02 +03:00
andrey
8c65cac1b2 fix datepicker 2021-11-16 14:34:19 +03:00
iIronside
87121dbdc8 adding a function for saving an array of user responses 2021-11-15 12:57:21 +03:00
iIronside
12914e9f8f add filters, update api, update api docs 2021-11-12 14:30:01 +03:00
iIronside
c1c24fc5e4 add filters, refactoring 2021-11-08 12:46:49 +03:00
iIronside
34c2998844 adding forgotten files for last commit 2021-10-28 10:51:14 +03:00
iIronside
79c197f673 add user-questionnaire, response, question, answers to api 2021-10-28 10:46:59 +03:00
iIronside
2882b8767c Initial commit. In user-questionnaire add checkAnswers and calculateScore 2021-10-22 16:55:08 +03:00
Korzinkayablok
79ddf1ce35 Removed comments 2021-09-15 16:43:14 +03:00
Korzinkayablok
6c14d4c7e1 Removed achievements from profile search form filters. Added doc for api/profile 2021-09-15 16:14:08 +03:00
Korzinkayablok
b2b3a7b462 - ProfileSearchForm now contains achievements array. Profile index action by id, by params response now contains achievements array 2021-09-14 14:43:09 +03:00
9ebfb3323c
Merge pull request #62 from apuc/achievements-link-fix
Achievments links fix
2021-09-14 13:54:31 +03:00
Korzinkayablok
934a8a6371 Achievments links fix 2021-09-14 13:52:13 +03:00
724a287a5e
Merge pull request #61 from q6q9/API_reports
Api reports
2021-09-14 13:49:45 +03:00
q6q9
85760914eb API:возможность получить репорты по user_id, в промежутке от fromDate до toDate 2021-09-14 12:21:12 +03:00
Korzinkayablok
243a42fe5a Removed alt from achievements images 2021-09-13 13:40:52 +03:00