Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024年度版FinanSu 1st リリース #725

Merged
merged 143 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
2c3ab05
[fix]編集モーダルでユーザーが反映されないバグ修正
dyusuke3263 Nov 28, 2023
24486ec
formatted by workflow
dyusuke3263 Nov 28, 2023
a4f4cdf
[fix] 各年度ごとに取得するように修正
TkymHrt Feb 27, 2024
2303603
[fix]列名削除、調整
Mar 5, 2024
ec12ea8
[fix]列名削除、調整
Mar 5, 2024
563e8d7
[fix] 登録されたデータが編集モーダルに反映されるよう修正
TkymHrt Mar 5, 2024
039103a
[fix] データが無い時のCSSを調整
TkymHrt Mar 5, 2024
881c5b6
[fix] 企業名確認のためのチェックボックスを追記
hikahana Mar 5, 2024
154ec9a
[fix] 教員の所属を反映して教員名が登録されるように修正
TkymHrt Mar 6, 2024
49bd481
[fix] ユーザー名が正しくsetされるように修正
TkymHrt Mar 6, 2024
afee1bc
Merge pull request #687 from NUTFes/fix/yama/677-year-switching-function
Kubosaka Mar 6, 2024
993df5d
[fix]購入申請の物品のスタイルの修正
Kubosaka Mar 7, 2024
6476b98
[fix]postを最後にまとめて行う
Kubosaka Mar 7, 2024
19cffbb
[fix]不要な削除関数の削除
Kubosaka Mar 7, 2024
a38dfce
formatted by workflow
Kubosaka Mar 7, 2024
99888f6
[feat] purchaseItemが無い場合の表示を追加
TkymHrt Mar 7, 2024
c520d4e
formatted by workflow
TkymHrt Mar 8, 2024
d9d3d4f
[fix] 編集機能でformDataListがnullの時の条件を追加
TkymHrt Mar 8, 2024
109689d
minio導入
Kubosaka Mar 18, 2024
8772c08
minioファイルアップロード
Kubosaka Mar 18, 2024
46ddcb2
[fix] 登録されたデータの反映と更新のUseEffectを再修正
TkymHrt Mar 18, 2024
722bb3d
プレビュー画面追加
Kubosaka Mar 18, 2024
abef556
ファイルダウンロード機能
Kubosaka Mar 18, 2024
7b59e28
Merge pull request #699 from NUTFes/feat/kubosaka/698-fix-purchase_or…
hikahana Mar 19, 2024
73c147c
API作成
Kubosaka Mar 19, 2024
10d7e8e
[feat] selectにdefaultValueを追加
hikahana Mar 19, 2024
90f74f1
[fix] ログインしているユーザーを表示させるように変更
hikahana Mar 19, 2024
3414b43
A[PI修正
Kubosaka Mar 19, 2024
4a7497e
[feat]協賛活動の領収書のPDF出力
KazumaSun Mar 19, 2024
d1f8246
formatted by workflow
KazumaSun Mar 19, 2024
7a07938
[feat]画像の表示
Kubosaka Mar 19, 2024
5cf1a0b
[fix]列名削除、調整
Mar 19, 2024
3d1425e
formatted by workflow
keisuke-japan Mar 19, 2024
a83de59
Merge pull request #693 from NUTFes/fix/yamada/653-purchase-teble
hikahana Mar 19, 2024
c286b4b
[fix] 年度別に支出の選択欄を選べるように変更
hikahana Mar 19, 2024
2cd3073
formatted by workflow
hikahana Mar 19, 2024
8f29681
[fix] 企業名を入力させるようにバリデーションを追加
hikahana Mar 19, 2024
2b9c0b5
[fix]複数の画像の登録
Kubosaka Mar 19, 2024
8aa5197
[feat]ファイルアップロードのモーダルのコンポーネント作成
Kubosaka Mar 19, 2024
c8acb39
[fix]ファイルアップロードのスタイル編集
Kubosaka Mar 20, 2024
4b1a99b
[feat]デザインの追加・削除機能追加
Kubosaka Mar 20, 2024
0404ce3
[fix]lintエラーの修正
Kubosaka Mar 20, 2024
9e38c15
[feat] react-pdfの導入
TkymHrt Mar 20, 2024
a618050
[feat] PDFプレビューページを追加
TkymHrt Mar 20, 2024
1ade862
[feat] 請求書PDFの作成
TkymHrt Mar 20, 2024
6eae4ee
[feat] 請求書作成ボタンを追加
TkymHrt Mar 20, 2024
aa18377
[fix]golangci-lint対策
Kubosaka Mar 20, 2024
65ac1ae
[fix]golangci-lint対策
Kubosaka Mar 20, 2024
1247176
[fix]golangci-lint対策
Kubosaka Mar 20, 2024
20a3163
[fix]golangci-lint対策
Kubosaka Mar 20, 2024
f3f5ccf
[fix]golangci-lint対策
Kubosaka Mar 20, 2024
602af8e
Revert "[feat] PDFプレビューページを追加"
TkymHrt Mar 20, 2024
796a3fb
[fix]golangci-lint対策
Kubosaka Mar 20, 2024
c520bb0
formatted by workflow
TkymHrt Mar 20, 2024
1f7b291
[fix]golangci-lint対策
Kubosaka Mar 20, 2024
e0cb258
[fix]ignore削除
Kubosaka Mar 20, 2024
384c2d6
[fix]envをgitignore
Kubosaka Mar 21, 2024
3d5fc4b
[fix]selected→valueに変更
Kubosaka Mar 21, 2024
0693a04
Merge pull request #662 from NUTFes/fix/match/647/fix-activity-modal
Kubosaka Mar 21, 2024
dc213f8
Merge pull request #695 from NUTFes/fix/yamada/694-purchase-app-table
Kubosaka Mar 21, 2024
ccd8f94
[fix]レビュー修正
KazumaSun Mar 21, 2024
e725f64
Merge branch 'feature/sato/706-output-sponsor-activity' of github.com…
KazumaSun Mar 21, 2024
3f290d2
formatted by workflow
KazumaSun Mar 21, 2024
6392ed0
[fix] データ更新と表示の仕組みを修正
TkymHrt Mar 21, 2024
be88557
Merge pull request #703 from NUTFes/fix/yama/701-fix-item-null-bug
Kubosaka Mar 21, 2024
3694737
[fix]不要なファイル削除
Kubosaka Mar 21, 2024
237a521
[fix] 配置ディレクトリの変更
TkymHrt Mar 21, 2024
df95902
[feat] 請求日と備考の入力機能を追加
TkymHrt Mar 21, 2024
f806ff6
formatted by workflow
TkymHrt Mar 21, 2024
2750a86
[fix] 企業名確認のチェックボックスを追加
hikahana Mar 21, 2024
b2d45c3
[fix]ボタンのデザイン修正
Kubosaka Mar 22, 2024
99f9ad3
[fix]タイポ修正
Kubosaka Mar 22, 2024
4fc8b38
[fix]envファイルの削除
Kubosaka Mar 22, 2024
d07bbea
Merge pull request #696 from NUTFes/fix/yama/663-fix-modal-bug
Kubosaka Mar 22, 2024
f397072
Merge pull request #697 from NUTFes/fix/hikahana/689-checked-sponsor-…
Kubosaka Mar 22, 2024
38af866
[feat]ログインユーザーを初期値
Kubosaka Mar 22, 2024
3285355
formatted by workflow
Kubosaka Mar 22, 2024
ab6deb6
Merge branch 'develop' into feature/sato/706-output-sponsor-activity
KazumaSun Mar 22, 2024
1b992a6
[fix]購入報告のレビュー箇所修正
KazumaSun Mar 22, 2024
efb98ed
Merge branch 'feature/sato/706-output-sponsor-activity' of github.com…
KazumaSun Mar 22, 2024
1dcdaad
formatted by workflow
KazumaSun Mar 22, 2024
ca3a219
[fix]本番環境のバグ修正
Kubosaka Mar 27, 2024
88d7fb3
[feat] 年度別にexpenseを取得するAPIの作成
hikahana Mar 27, 2024
d5b03d8
[fix] 新規APIを使用して支出欄の選択肢を表示させる
hikahana Mar 27, 2024
cf98993
formatted by workflow
hikahana Mar 27, 2024
0338db0
[fix]lintのエラー対処
Kubosaka Mar 28, 2024
86921b7
Merge pull request #707 from NUTFes/fix/hikahana/702-login-default
Kubosaka Mar 28, 2024
f4fcd50
Merge pull request #709 from NUTFes/feature/sato/706-output-sponsor-a…
Kubosaka Mar 28, 2024
f9ad643
[feat]file情報追加に伴うAPI修正
Kubosaka Mar 28, 2024
961d35a
[fix]協賛活動のAPIに列の追加
Kubosaka Mar 28, 2024
ac61acd
[feat] デザインの修正&プレビュー機能の実装
TkymHrt Mar 28, 2024
12ddfce
Merge branch 'develop' of https://github.com/NUTFes/FinanSu into feat…
TkymHrt Mar 28, 2024
dbab5d6
formatted by workflow
TkymHrt Mar 28, 2024
9b27efc
[fix] 備考の文字を折り返すように修正
TkymHrt Mar 28, 2024
ab94212
[fix] PDFツールバーを非表示に設定
TkymHrt Mar 28, 2024
d733401
[feat]広告のステータスと情報を編集可能にする
Kubosaka Mar 29, 2024
5e3d8bb
Merge branch 'develop' into intro-minio
Kubosaka Mar 29, 2024
698c778
[fix]lintに伴う修正
Kubosaka Mar 29, 2024
170a69f
[fix]lintに伴う修正と閉じるボタンの復元
Kubosaka Mar 29, 2024
286f3ac
Merge pull request #712 from NUTFes/feat/yama/704-create-invoice-as-pdf
Kubosaka Mar 29, 2024
205f43e
Merge branch 'develop' into intro-minio
Kubosaka Mar 29, 2024
aadf114
formatted by workflow
Kubosaka Mar 29, 2024
c2dd3bc
Merge branch 'fix/hikahana/708-purchaseorder-periods-filter' into fea…
Kubosaka Mar 30, 2024
45f2fd8
Merge branch 'production-bug-fix' into feat/kubosaka/715-reports-filter
Kubosaka Mar 30, 2024
1f8c2e9
[feat]購入報告から選択する支出元を年度で指定できるように
Kubosaka Mar 31, 2024
8f3348b
[fix]年度が切り替わった際のexpenseIDの初期値を変更
Kubosaka Mar 31, 2024
e833da9
Merge branch 'production-bug-fix' into fix/kubosaka/717-sponsor-activ…
Kubosaka Mar 31, 2024
c621866
[fix]作成日時の列削除
Kubosaka Mar 31, 2024
8b5c424
[fix]オプションポスターの削除と交通費を直接入力するように
Kubosaka Mar 31, 2024
5685f40
[fix]/sponsorsのAPIのパスが被っていたため修正
Kubosaka Mar 31, 2024
81d7a5b
[fix]sponsorsのパス変更
Kubosaka Mar 31, 2024
efff10b
[feat]協賛活動登録時の企業を年度でフィルタリング
Kubosaka Mar 31, 2024
a584fbd
[feat]編集モーダルのポスター削除・交通費修正
Kubosaka Mar 31, 2024
7c6ad68
[feat]協賛活動の編集モーダルを企業の年度フィルター
Kubosaka Mar 31, 2024
186c03f
[fix]広告データurlの削除
Kubosaka Mar 31, 2024
938fa21
[fix]選択肢がない時の表示とボタンの非活性化
Kubosaka Apr 1, 2024
6f21a3a
[fix]nullの時の処理追加
Kubosaka Apr 1, 2024
ca6cb89
Q[fix]購入報告で同じ物品が2個表示されているバグの修正
Kubosaka Apr 1, 2024
6143039
[fix]購入報告の申請欄をはみ出さないように修正
Kubosaka Apr 1, 2024
99d4e35
[feat]購入報告ページの申請を年度別で取得
Kubosaka Apr 1, 2024
a6aadca
formatted by workflow
Kubosaka Apr 1, 2024
2221408
Merge pull request #713 from NUTFes/production-bug-fix
Kubosaka Apr 1, 2024
405bed4
Merge pull request #711 from NUTFes/intro-minio
Kubosaka Apr 1, 2024
60f08a8
Merge pull request #716 from NUTFes/feat/kubosaka/715-reports-filter
Kubosaka Apr 1, 2024
7e821b5
Merge branch 'develop' into fix/kubosaka/717-sponsor-activities-update
Kubosaka Apr 1, 2024
519a3d6
[fix] 不必要な定義の削除
hikahana Apr 1, 2024
84fe73d
[fix] yearPeriodsをpropsで渡すように修正
hikahana Apr 1, 2024
cfe39b2
[feat] 申請登録の購入したい局を年度別で選択できるように変更
hikahana Apr 1, 2024
f27e40a
formatted by workflow
hikahana Apr 1, 2024
f1ecb1a
[fix] formDataのexpenseIDの初期値更新
hikahana Apr 2, 2024
9105044
formatted by workflow
hikahana Apr 2, 2024
ea55a87
Merge pull request #718 from NUTFes/fix/kubosaka/717-sponsor-activiti…
Kubosaka Apr 2, 2024
a11e292
Merge pull request #720 from NUTFes/feat/hikahana/719-purchaseproder-…
Kubosaka Apr 2, 2024
a340d52
[feat]予算ページの支出元追加
KazumaSun Apr 2, 2024
5079049
formatted by workflow
KazumaSun Apr 2, 2024
cb926f3
[feat]支出元が無名の時に登録不可
KazumaSun Apr 2, 2024
0ed7c5d
Merge branch 'feat/sato/714-add-budgets-spending' of github.com:NUTFe…
KazumaSun Apr 2, 2024
27d3652
formatted by workflow
KazumaSun Apr 2, 2024
59e75af
[feat]購入報告登録のバグ修正
Kubosaka Apr 3, 2024
c1c0823
Merge pull request #721 from NUTFes/feat/sato/714-add-budgets-spending
Kubosaka Apr 3, 2024
d9f44da
環境変数をdockerfileに記入、表示するリンクを環境で変更するように修正
Kubosaka Apr 3, 2024
9b41d48
Merge pull request #724 from NUTFes/fix-minio-csr-path
Kubosaka Apr 3, 2024
0c701bb
Merge pull request #723 from NUTFes/fix/kubosaka/purchase_reports_fix…
Kubosaka Apr 3, 2024
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
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ api/tmp

# cloudflare
web/**/*.json
web/**/cert.pem
web/**/cert.pem

tmp/*

/view/next-project/.env
215 changes: 178 additions & 37 deletions api/docs/docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,26 +56,26 @@ const docTemplate = `{
}
},
},
"/activities/details/{year}": {
"get": {
tags: ["activity"],
"description": "年度で指定されたactivitiesとsponsor,sponsorStyle,userの一覧を取得",
"parameters": [
{
"name": "year",
"in": "path",
"description": "year",
"required": true,
"type": "integer"
}
],
"responses": {
"200": {
"description": "年度で指定されたactivitiesとsponsor,sponsorStyle,userの一覧を取得",
}
"/activities/details/{year}": {
"get": {
tags: ["activity"],
"description": "年度で指定されたactivitiesとsponsor,sponsorStyle,userの一覧を取得",
"parameters": [
{
"name": "year",
"in": "path",
"description": "year",
"required": true,
"type": "integer"
}
},
],
"responses": {
"200": {
"description": "年度で指定されたactivitiesとsponsor,sponsorStyle,userの一覧を取得",
}
}
},
},
"/activities/{id}": {
"get": {
tags: ["activity"],
Expand Down Expand Up @@ -139,6 +139,98 @@ const docTemplate = `{
},
},
},
"/activity_informations": {
"get": {
tags: ["activity_information"],
"description": "activity_informationの一覧を取得",
"responses": {
"200": {
"description": "activity_informationの一覧の取得",
}
}
},
"post": {
tags: ["activity_information"],
"description": "activity_informationの作成",
"parameters": [
{
"in": "body",
"name": "activity_information",
"schema":{
"$ref": "#/definitions/activity_information"
},
},
],
responses: {
"200": {
"description": "create されたactivity_informationが返ってくる",
}
},
},
},
"/activity_informations/{id}": {
"get": {
tags: ["activity_information"],
"description": "IDで指定されたactivity_informationsの取得",
"parameters": [
{
"name": "id",
"in": "path",
"description": "id",
"required": true,
"type": "integer"
}
],
"responses": {
"200": {
"description": "activity_informationの取得",
}
}
},
"put": {
tags: ["activity_information"],
"description": "activity_informationの更新",
responses: {
"200": {
"description": "更新されたactivity_informationが返ってくる",
}
},
"parameters": [
{
"name": "id",
"in": "path",
"description": "id",
"required": true,
"type": "integer"
},
{
"in": "body",
"name": "activity_information",
"schema":{
"$ref": "#/definitions/activity_information"
},
},
],
},
"delete": {
tags: ["activity_information"],
"description": "IDを指定してactivity_informationの削除",
"parameters": [
{
"name": "id",
"in": "path",
"description": "id",
"required": true,
"type": "integer"
}
],
responses: {
"200": {
"description": "activity_informationの削除完了",
}
},
},
},
"/activity_styles": {
"get": {
tags: ["activity_style"],
Expand Down Expand Up @@ -731,6 +823,26 @@ const docTemplate = `{
}
},
},
"/expenses/fiscalyear/{year}": {
"get": {
tags: ["expense"],
"description": "年度で指定されたexpensesを取得",
"parameters": [
{
"name": "year",
"in": "path",
"description": "year",
"required": true,
"type": "integer"
}
],
"responses": {
"200": {
"description": "yearで指定されたexpensesを取得",
}
}
},
},
"/fund_informations": {
"get": {
tags: ["fund_information"],
Expand Down Expand Up @@ -1647,26 +1759,26 @@ const docTemplate = `{
},
},
},
"/sponsors/{year}": {
"get": {
tags: ["sponsor"],
"description": "年度で指定されたsponsorを取得",
"parameters": [
{
"name": "year",
"in": "path",
"description": "year",
"required": true,
"type": "integer"
}
],
"responses": {
"200": {
"description": "sponsorの取得完了",
}
"/sponsors/periods/{year}": {
"get": {
tags: ["sponsor"],
"description": "年度で指定されたsponsorを取得",
"parameters": [
{
"name": "year",
"in": "path",
"description": "year",
"required": true,
"type": "integer"
}
},
],
"responses": {
"200": {
"description": "sponsorの取得完了",
}
}
},
},
"/sponsorstyles": {
"get": {
tags: ["sponsorstyle"],
Expand Down Expand Up @@ -2212,7 +2324,6 @@ const docTemplate = `{
"sponsorID":{
"type": "int",
"example": 1,

},
"userID":{
"type": "int",
Expand Down Expand Up @@ -2253,6 +2364,36 @@ const docTemplate = `{
"remark",
},
},
"activity_information":{
"properties":{
"activityID":{
"type": "int",
"example": 1,

},
"bucketName":{
"type": "string",
"example": "なし",
},
"fileName":{
"type": "string",
"example": "なし",
},
"fileType":{
"type": "string",
"example": "なし",

},
"designProgress":{
"type": "int",
"example": 1,
},
"fileInformation":{
"type": "string",
"example": "",
},
},
},
"activity_style":{
"properties":{
"activityID":{
Expand Down
102 changes: 102 additions & 0 deletions api/externals/controller/activity_information_controller.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
package controller

import (
"fmt"
"net/http"
"strconv"

"github.com/NUTFes/FinanSu/api/internals/domain"
"github.com/NUTFes/FinanSu/api/internals/usecase"

"github.com/labstack/echo/v4"

Check failure on line 11 in api/externals/controller/activity_information_controller.go

View workflow job for this annotation

GitHub Actions / golangci-lint

"github.com/labstack/echo/v4" imported but not used (typecheck)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [golangci] reported by reviewdog 🐶
"github.com/labstack/echo/v4" imported but not used (typecheck)

)

type activityInformationController struct {
u usecase.ActivityInformationUseCase
}

type ActivityInformationController interface {
IndexActivityInformation(echo.Context) error
ShowActivityInformation(echo.Context) error
CreateActivityInformation(echo.Context) error
UpdateActivityInformation(echo.Context) error
DestroyActivityInformation(echo.Context) error
}

func NewActivityInformationController(u usecase.ActivityInformationUseCase) ActivityInformationController {
return &activityInformationController{u}
}

// Index
func (a *activityInformationController) IndexActivityInformation(c echo.Context) error {
activityInformations, err := a.u.GetActivityInformation(c.Request().Context())
if err != nil {
return err
}
return c.JSON(http.StatusOK, activityInformations)
}

// Show
func (a *activityInformationController) ShowActivityInformation(c echo.Context) error {
id := c.Param("id")
activityInformation, err := a.u.GetActivityInformationByID(c.Request().Context(), id)
if err != nil {
return err
}
return c.JSON(http.StatusOK, activityInformation)
}

// Create
func (a *activityInformationController) CreateActivityInformation(c echo.Context) error {
activityInformation := new(domain.ActivityInformation)
if err := c.Bind(activityInformation); err != nil {
fmt.Println("err")
return err
}

latastActivityInformation, err := a.u.CreateActivityInformation(c.Request().Context() ,
strconv.Itoa(int(activityInformation.ActivityId)),
activityInformation.BucketName,
activityInformation.FileName,
activityInformation.FileType,
strconv.Itoa(int(activityInformation.DesignProgress)),
activityInformation.FileInformation,
)
if err != nil {
return err
}
return c.JSON(http.StatusOK, latastActivityInformation)
}

// Update
func (a *activityInformationController) UpdateActivityInformation(c echo.Context) error {
id := c.Param("id")
activityInformation := new(domain.ActivityInformation)
if err := c.Bind(activityInformation); err != nil {
fmt.Println("err")
return err
}
updatedActivity, err := a.u.UpdateActivityInformation(c.Request().Context(),
id,
strconv.Itoa(int(activityInformation.ActivityId)),
activityInformation.BucketName,
activityInformation.FileName,
activityInformation.FileType,
strconv.Itoa(int(activityInformation.DesignProgress)),
activityInformation.FileInformation)

if err != nil {
return err
}
return c.JSON(http.StatusOK, updatedActivity)
}

// Destroy
func (a *activityInformationController) DestroyActivityInformation(c echo.Context) error {
id := c.Param("id")
err := a.u.DestroyActivityInformation(c.Request().Context(), id)
if err != nil {
return err
}
return c.JSON(http.StatusOK, "Destroy ActivityInformations")
}
10 changes: 10 additions & 0 deletions api/externals/controller/expense_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type ExpenseController interface {
IndexExpenseDetails(echo.Context) error
ShowExpenseDetail(echo.Context) error
IndexExpenseDetailsByPeriod(echo.Context) error
IndexExpenseByPeriod(echo.Context) error
}

func NewExpenseController(u usecase.ExpenseUseCase) ExpenseController {
Expand Down Expand Up @@ -119,3 +120,12 @@ func (e *expenseController) IndexExpenseDetailsByPeriod(c echo.Context) error {
}
return c.JSON(http.StatusOK, expenseDetails)
}

func (e *expenseController) IndexExpenseByPeriod(c echo.Context) error {
year := c.Param("year")
expense, err := e.u.GetExpensesByPeriod(c.Request().Context(), year)
if err != nil {
return err
}
return c.JSON(http.StatusOK, expense)
}
Loading
Loading