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

Custom Target Expressions #2184

Open
wants to merge 71 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
233c641
Custom Target Expressions v3.4.1
tisseandorius Apr 25, 2024
1f1ab86
format
tisseandorius Apr 25, 2024
3f944c1
Merge remote-tracking branch 'upstream/master'
tisseandorius May 3, 2024
f8d95bd
Custom Target Expressions v3.5
tisseandorius May 9, 2024
49b7e6e
Merge branch 'frzyc:master' into master
tisseandorius May 10, 2024
41452d2
Custom Target Expressions v3.5.1
tisseandorius May 14, 2024
5c9c9d7
Merge branch 'orig' into merge-test
tisseandorius May 14, 2024
1a07a8e
Merge branch 'orig' into merge-test
tisseandorius May 14, 2024
05658fa
Custom Target Expressions v4.beta
tisseandorius May 16, 2024
cb7f2fd
Custom Target Expressions v3.6
tisseandorius May 16, 2024
cf65823
Custom Target Expressions v3.7
tisseandorius May 17, 2024
ea5b4bb
Custom Target Expressions v3.7.1
tisseandorius May 17, 2024
bf3eb27
Custom Target Expressions v4 prerelease 1
tisseandorius May 19, 2024
8ce918d
Custom Target Expressions v4
tisseandorius May 20, 2024
9d93752
format
tisseandorius May 20, 2024
69590dd
CTE v4 Custom Functions prerelease 3
tisseandorius May 21, 2024
4c1dfab
CTE v4 Custom Functions prerelease 4
tisseandorius May 23, 2024
7d15955
CTE v4 Custom Functions prerelease 5
tisseandorius May 23, 2024
e2c6310
Merge branch 'orig' into merge-test
tisseandorius May 23, 2024
525596d
Merge branch 'merge-test'
tisseandorius May 23, 2024
8340dad
CTE v4 Custom Functions prerelease 6
tisseandorius May 26, 2024
a083258
Custom Target Expressions v4
tisseandorius May 26, 2024
8e7e2b8
Custom Target Expressions v4.1
tisseandorius May 26, 2024
22e5037
Custom Target Expressions v4.1.1
tisseandorius May 26, 2024
9a6a701
Custom Target Expressions v4.1.2
tisseandorius May 26, 2024
42dc1f0
format
tisseandorius May 26, 2024
d5a56ba
Custom Target Expressions v4.1.3
tisseandorius May 26, 2024
7c79fc3
Custom Target Expressions v4.2
tisseandorius May 26, 2024
59325c5
Custom Target Expressions v4.3
tisseandorius May 26, 2024
d808061
Custom Target Expressions v4.3.1
tisseandorius May 27, 2024
ff75679
Merge branch 'frzyc:master' into master
tisseandorius Jun 5, 2024
826b1a9
Merge branch 'frzyc:master' into master
tisseandorius Jun 5, 2024
2a296b3
Merge branch 'orig'
tisseandorius Jun 8, 2024
f1ffb47
Custom Target Expressions v4.3.2
tisseandorius Jun 9, 2024
7505dac
Merge branch 'frzyc:master' into master
tisseandorius Jun 9, 2024
9656e67
Revert "Custom Target Expressions v4.3.2"
tisseandorius Jun 11, 2024
3b5b566
Custom Target Expressions v4.3.3
tisseandorius Jun 11, 2024
0b04675
Merge branch 'frzyc:master' into master
tisseandorius Jun 11, 2024
e89049a
Custom Target Expressions v4.3.4
tisseandorius Jun 11, 2024
4e68201
Custom Target Expressions v4.4
tisseandorius Jun 11, 2024
c4a04aa
format
tisseandorius Jun 11, 2024
43b3ebb
Merge branch 'frzyc:master' into master
tisseandorius Jun 15, 2024
3c5c847
Custom Target Expressions v4.5
tisseandorius Jun 15, 2024
669c703
Custom Target Expressions v4.5.1
tisseandorius Jun 15, 2024
1f07b58
Merge branch 'frzyc:master' into master
tisseandorius Jun 16, 2024
750be08
Custom Target Expressions v4.6
tisseandorius Jun 16, 2024
83deea6
Custom Target Expressions v4.6.1
tisseandorius Jun 16, 2024
0edc335
Custom Target Expressions v4.6.2
tisseandorius Jun 16, 2024
4858b78
Custom Target Expressions v4.6.3
tisseandorius Jun 16, 2024
b8c5b56
Custom Target Expressions v4.6.4
tisseandorius Jun 23, 2024
c94e40d
Merge branch 'master' into master
tisseandorius Jun 23, 2024
e455de3
Custom Target Expressions v4.6.5
tisseandorius Jun 23, 2024
4b23cdc
Merge branch 'frzyc:master' into master
tisseandorius Jul 4, 2024
f4340ff
Custom Target Expressions v4.6.6
tisseandorius Jul 5, 2024
651a98c
Custom Target Expressions v4.6.7
tisseandorius Jul 6, 2024
b591c33
Custom Target Expressions v4.6.8
tisseandorius Jul 6, 2024
014b18d
Custom Target Expressions v4.6.9
tisseandorius Jul 7, 2024
6bc5a26
Custom Target Expressions v4.7
tisseandorius Jul 7, 2024
d4e8761
Custom Target Expressions v4.7.1
tisseandorius Jul 10, 2024
24e46f5
Merge branch 'frzyc:master' into master
tisseandorius Jul 10, 2024
2a0a67e
Merge branch 'frzyc:master' into master
tisseandorius Jul 16, 2024
23b0450
Team Optimization v0.1
tisseandorius Jul 17, 2024
071ad35
Team Optimization v0.2
tisseandorius Jul 20, 2024
1f371e8
Team Optimization v0.2.1
tisseandorius Jul 20, 2024
9e3208e
Team Optimization v0.2.2
tisseandorius Jul 20, 2024
82590ea
Team Optimization v0.2.3
tisseandorius Jul 20, 2024
bd025a0
Merge branch 'orig' into merge
tisseandorius Jul 21, 2024
53a7f6a
Team Optimization v0.3
tisseandorius Jul 25, 2024
eb821f0
Team Optimization v0.3.1
tisseandorius Jul 25, 2024
721139a
Team Optimization v0.3.2
tisseandorius Jul 25, 2024
cf22909
Team Optimization v0.3.3
tisseandorius Jul 25, 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
Prev Previous commit
Next Next commit
format
  • Loading branch information
tisseandorius committed May 26, 2024
commit 42dc1f0a3c86fbb6cebbf77b1ab5acaad7f28302
Original file line number Diff line number Diff line change
Expand Up @@ -203,40 +203,41 @@ export default function AddItemsPanel({
<Box display="flex" gap={1}>
<Box sx={{ flexGrow: 1 }} display="flex" flexDirection="column" gap={1}>
<Box display="flex" gap={1}>
<Button
key={'addNewFunction'}
sx={{ flexGrow: 1 }}
onClick={() => addFunction({})}
>{t`multiTarget.addNewFunction`}</Button>
<Button
key={'addNewArgument'}
sx={{ flexGrow: 1 }}
onClick={() => addArgument({})}
>{t`multiTarget.addNewArgument`}</Button>
<Button
key={'addNewTarget'}
sx={{ flexGrow: 2 }}
onClick={onShow}
>{t`multiTarget.addNewTarget`}</Button>
{addFunctionUnitButton}
<ButtonGroup>
<Button key={'addConstant'} onClick={addConstant}>
{t`multiTarget.add`}
</Button>
<CustomNumberInputButtonGroupWrapper>
<CustomNumberInput
float
value={newNumber}
onChange={setNewNumber}
inputProps={{ sx: { pl: 1 } }}
/>
</CustomNumberInputButtonGroupWrapper>
<Button
key={'addNewFunction'}
sx={{ flexGrow: 1 }}
onClick={() => addFunction({})}
>{t`multiTarget.addNewFunction`}</Button>
<Button
key={'addNewArgument'}
sx={{ flexGrow: 1 }}
onClick={() => addArgument({})}
>{t`multiTarget.addNewArgument`}</Button>
<Button
key={'addNewTarget'}
sx={{ flexGrow: 2 }}
onClick={onShow}
>{t`multiTarget.addNewTarget`}</Button>
{addFunctionUnitButton}
<ButtonGroup>
<Button key={'addConstant'} onClick={addConstant}>
{t`multiTarget.add`}
</Button>
<CustomNumberInputButtonGroupWrapper>
<CustomNumberInput
float
value={newNumber}
onChange={setNewNumber}
inputProps={{ sx: { pl: 1 } }}
/>
</CustomNumberInputButtonGroupWrapper>
<Button key={'addConstant'} onClick={
() => addUnit({ type: 'constant', value: 1 })
}>
{'1'}
</Button>
</ButtonGroup>
key={'addConstant'}
onClick={() => addUnit({ type: 'constant', value: 1 })}
>
{'1'}
</Button>
</ButtonGroup>
</Box>
<ButtonGroup fullWidth>
{OperationButtons}
Expand Down