Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Walter Felipe
submeta
Commits
a21ee1c3
Commit
a21ee1c3
authored
Jul 20, 2022
by
S-Nathalia
Browse files
resolvendo conflitos
parents
7242f654
58164163
Changes
3
Hide whitespace changes
Inline
Side-by-side
resources/views/projeto/editaFormulario/participantes.blade.php
View file @
a21ee1c3
...
@@ -321,7 +321,8 @@
...
@@ -321,7 +321,8 @@
<select
name=
"ordem_prioridade[]"
class=
"form-control"
>
<select
name=
"ordem_prioridade[]"
class=
"form-control"
>
<option
value=
""
selected
>
-- ORDEM --
</option>
<option
value=
""
selected
>
-- ORDEM --
</option>
@for($j = 1; $j
<
=
$
edital-
>
numParticipantes; $j++)
@for($j = 1; $j
<
=
$
edital-
>
numParticipantes; $j++)
<option
@
if
(
old
('
total_periodos
')[$
i
]
??
$
participante-
>
ordem_prioridade == $j ) selected @endif value="{{ $j }}">{{ $j }}
</option>
<option
@
if
(
old
('
total_periodos
')[$
i
]
??
($
participante-
>
ordem_prioridade ?? '') == $j ) selected @endif value="{{ $j }}">{{ $j }}
</option>
@endfor
@endfor
</select>
</select>
...
...
resources/views/proponente/projetos.blade.php
View file @
a21ee1c3
...
@@ -127,7 +127,7 @@
...
@@ -127,7 +127,7 @@
--
}}
--
}}
<!--
Button
trigger
modal
-->
<!--
Button
trigger
modal
-->
@
if
((
$projeto
->
status
==
"rascunho"
)
||
(
$projeto
->
evento
->
fimSubmissao
>
$hoje
))
<
div
class
=
"container"
>
<
div
class
=
"container"
>
<
div
class
=
"row"
>
<
div
class
=
"row"
>
<
div
class
=
"col text-center"
style
=
"margin-left: 20px"
>
<
div
class
=
"col text-center"
style
=
"margin-left: 20px"
>
...
@@ -137,6 +137,7 @@
...
@@ -137,6 +137,7 @@
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
@
endif
</
div
>
</
div
>
</
div
>
</
div
>
...
...
resources/views/proponente/projetosEdital.blade.php
View file @
a21ee1c3
...
@@ -151,7 +151,7 @@
...
@@ -151,7 +151,7 @@
--
}}
--
}}
<!--
Button
trigger
modal
-->
<!--
Button
trigger
modal
-->
@
if
((
$projeto
->
status
==
"rascunho"
)
||
(
$projeto
->
evento
->
fimSubmissao
>
$hoje
))
<
div
class
=
"container"
>
<
div
class
=
"container"
>
<
div
class
=
"row"
>
<
div
class
=
"row"
>
<
div
class
=
"col text-center"
style
=
"margin-left: 20px"
>
<
div
class
=
"col text-center"
style
=
"margin-left: 20px"
>
...
@@ -161,6 +161,7 @@
...
@@ -161,6 +161,7 @@
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
@
endif
</
div
>
</
div
>
</
div
>
</
div
>
</
td
>
</
td
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment