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